Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux/net
History
Johannes Berg 1e1430d528 Merge remote-tracking branch 'net-next/master' into mac80211-next 
Resolve the merge conflict between Felix's/my and Toke's patches
coming into the tree through net and mac80211-next respectively.
Most of Felix's changes go away due to Toke's new infrastructure
work, my patch changes to "goto begin" (the label wasn't there
before) instead of returning NULL so flow control towards drivers
is preserved better.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 		2016-10-04 09:46:44 +02:00
..
6lowpan 6lowpan: ndisc: no overreact if no short address is available 2016-09-19 20:19:34 +02:00
9p
…
802
…
8021q
…
appletalk
…
atm
…
ax25
…
batman-adv Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-23 06:46:57 -04:00
bluetooth Bluetooth: Fix not updating scan rsp when adv off 2016-09-22 17:48:23 +02:00
bridge netfilter: bridge: clarify bridge/netfilter message 2016-10-02 22:44:03 -04:00
caif
…
can
…
ceph
…
core net: Add netdev all_adj_list refcnt propagation to fix panic 2016-10-04 02:05:31 -04:00
dcb
…
dccp
…
decnet
…
dns_resolver
…
dsa net: dsa: add port fast ageing 2016-09-23 08:38:50 -04:00
ethernet
…
hsr
…
ieee802154
…
ipv4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-02 22:20:41 -04:00
ipv6 ipv6 addrconf: remove addrconf_sysctl_hop_limit() 2016-10-02 23:48:13 -04:00
ipx
…
irda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-23 06:46:57 -04:00
iucv
…
kcm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
key
…
l2tp l2tp: constify net_device_ops structures 2016-09-17 10:07:23 -04:00
l3mdev
…
lapb
…
llc llc: switch type to bool as the timeout is only tested versus 0 2016-09-17 10:05:05 -04:00
mac80211 Merge remote-tracking branch 'net-next/master' into mac80211-next 2016-10-04 09:46:44 +02:00
mac802154 mac802154: use rate limited warnings for malformed frames 2016-09-19 20:19:34 +02:00
mpls mpls: move mpls_hdr to a common location 2016-10-03 02:00:21 -04:00
ncsi net/ncsi: Introduce ncsi_stop_dev() 2016-10-04 02:11:51 -04:00
netfilter Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2016-09-25 23:34:19 +02:00
netlabel
…
netlink
…
netrom
…
nfc
…
openvswitch openvswitch: use mpls_hdr 2016-10-03 02:00:22 -04:00
packet
…
phonet
…
qrtr
…
rds
…
rfkill
…
rose
…
rxrpc rxrpc: Fix the call timer handling 2016-09-30 14:40:11 +01:00
sched net/sched: act_vlan: Push skb->data to mac_header prior calling skb_vlan_*() functions 2016-10-03 21:40:50 -04:00
sctp Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-02 22:20:41 -04:00
strparser
…
sunrpc Fix a memory corruption bug that I introduced in 4.7. 2016-09-16 17:00:26 -07:00
switchdev switchdev: remove FIB offload infrastructure 2016-09-28 04:48:00 -04:00
tipc tipc: fix possible memory leak in tipc_udp_enable() 2016-09-13 11:28:32 -04:00
unix
…
vmw_vsock VSOCK: Don't dec ack backlog twice for rejected connections 2016-09-27 07:59:25 -04:00
wimax
…
wireless Merge remote-tracking branch 'net-next/master' into mac80211-next 2016-10-04 09:46:44 +02:00
x25
…
xfrm proc: Reduce cache miss in xfrm_statistics_seq_show 2016-09-30 01:50:45 -04:00
Kconfig
…
Makefile
…
compat.c
…
socket.c
…
sysctl_net.c net: Use ns_capable_noaudit() when determining net sysctl permissions 2016-10-01 03:24:28 -04:00