iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-15 13:32:48 -04:00
..
6lowpan
6lowpan: move mac802154 header
2016-04-13 10:41:10 +02:00
9p
net/9p: convert to new CQ API
2016-03-10 20:54:09 -05:00
802
…
8021q
vlan: propagate gso_max_segs
2016-03-17 21:05:01 -04:00
appletalk
appletalk: fix erroneous return value
2016-02-18 14:59:34 -05:00
atm
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
ax25
ax25: add link layer header validation function
2016-03-09 22:13:01 -05:00
batman-adv
batman-adv: use batadv_compare_eth when possible
2016-05-10 18:28:54 +08:00
bluetooth
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-09 15:59:24 -04:00
caif
net: caif: fix misleading indentation
2016-03-14 13:09:50 -04:00
can
sock: enable timestamping using control messages
2016-04-04 15:50:30 -04:00
ceph
libceph: make authorizer destruction independent of ceph_auth_client
2016-04-25 20:54:13 +02:00
core
net: l3mdev: Add hook in ip and ipv6
2016-05-11 19:31:40 -04:00
dcb
…
dccp
dccp: do not assume DCCP code is non preemptible
2016-05-02 17:02:25 -04:00
decnet
decnet: Do not build routes to devices without decnet private data.
2016-04-10 23:01:30 -04:00
dns_resolver
net: dns_resolver: convert time_t to time64_t
2015-11-18 16:27:46 -05:00
dsa
dsa: Rename switch chip data to cd
2016-05-11 19:36:28 -04:00
ethernet
eth: Pull header from first fragment via eth_get_headlen
2016-02-24 13:58:05 -05:00
hsr
NLA_BINARY misuse bug in HSR
2016-04-21 13:59:08 -04:00
ieee802154
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2016-04-26 13:15:56 -04:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-15 13:32:48 -04:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-15 13:32:48 -04:00
ipx
…
irda
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
iucv
af_iucv: Validate socket address length in iucv_sock_bind()
2016-01-19 14:21:08 -05:00
kcm
kcm: Add receive message timeout
2016-03-09 16:36:15 -05:00
key
…
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-04 00:52:29 -04:00
l3mdev
net: l3mdev: Allow send on enslaved interface
2016-05-09 22:33:52 -04:00
lapb
…
llc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-09 15:59:24 -04:00
mac80211
Some more work for 4.7, notably:
2016-05-12 11:46:58 -04:00
mac802154
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
mpls
GSO: Add GSO type for fixed IPv4 ID
2016-04-14 16:23:40 -04:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-15 13:32:48 -04:00
netlabel
netlabel: do not initialise statics to NULL
2016-03-07 11:08:26 -05:00
netlink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
netrom
…
nfc
nfc: nci: Add nci_nfcc_loopback to the nci core
2016-05-04 01:48:16 +02:00
openvswitch
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-15 13:32:48 -04:00
packet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
phonet
sock: struct proto hash function may error
2016-02-11 03:54:14 -05:00
qrtr
net: Add Qualcomm IPC router
2016-05-08 23:46:14 -04:00
rds
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-04 00:52:29 -04:00
rfkill
rfkill: Use switch to demux userspace operations
2016-04-05 10:48:53 +02:00
rose
…
rxrpc
net: udp: rename UDP_INC_STATS_BH()
2016-04-27 22:48:23 -04:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-15 13:32:48 -04:00
sctp
sctp: prepare for socket backlog behavior change
2016-05-02 17:02:26 -04:00
sunrpc
sunrpc: set SOCK_FASYNC
2016-05-13 01:43:52 -04:00
switchdev
net: switchdev: Drop EXPERIMENTAL from description
2016-05-14 17:06:37 -04:00
tipc
tipc: eliminate risk of double link_up events
2016-05-12 17:11:27 -04:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-02-23 00:09:14 -05:00
vmw_vsock
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-09 15:59:24 -04:00
wimax
…
wireless
cfg80211: make wdev_list accessible to drivers
2016-05-12 11:16:40 +02:00
x25
net: fix a kernel infoleak in x25 module
2016-05-09 22:45:33 -04:00
xfrm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-09 15:59:24 -04:00
compat.c
…
Kconfig
net: Add Qualcomm IPC router
2016-05-08 23:46:14 -04:00
Makefile
net: Add Qualcomm IPC router
2016-05-08 23:46:14 -04:00
socket.c
tcp: remove SKBTX_ACK_TSTAMP since it is redundant
2016-04-28 16:06:10 -04:00
sysctl_net.c
…