Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net
History
David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-26 23:42:21 -05:00
..
6lowpan
6lowpan: ndisc: no overreact if no short address is available
2016-09-19 20:19:34 +02:00
9p
IB/core: add support to create a unsafe global rkey to ib_create_pd
2016-09-23 13:47:44 -04:00
802
net: use core MTU range checking in misc drivers
2016-10-20 14:51:10 -04:00
8021q
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
appletalk
appletalk: use IS_ENABLED() instead of checking for built-in or module
2016-09-10 21:19:10 -07:00
atm
net: remove MTU limits on a few ether_setup callers
2016-10-21 13:57:50 -04:00
ax25
AX.25: Close socket connection on session completion
2016-06-18 20:55:34 -07:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-26 23:42:21 -05:00
bridge
bridge: mcast: add MLDv2 querier support
2016-11-21 13:16:58 -05:00
caif
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
can
can: bcm: fix support for CAN FD frames
2016-11-23 15:22:18 +01:00
ceph
libceph: initialize last_linger_id with a large integer
2016-11-10 20:13:08 +01:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-26 23:42:21 -05:00
dcb
…
dccp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-15 10:54:36 -05:00
decnet
net: fix sleeping for sk_wait_event()
2016-11-14 13:17:21 -05:00
dns_resolver
KEYS: Add a facility to restrict new links into a keyring
2016-04-11 22:37:37 +01:00
dsa
net: remove MTU limits on a few ether_setup callers
2016-10-21 13:57:50 -04:00
ethernet
net: make default TX queue length a defined constant
2016-11-07 20:15:55 -05:00
hsr
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
ieee802154
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-26 23:42:21 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-26 23:42:21 -05:00
ipx
…
irda
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
iucv
Subject: [PATCH] af_iucv: drop skbs rejected by filter
2016-10-12 01:56:04 -04:00
kcm
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-07 15:36:58 -07:00
key
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-26 23:42:21 -05:00
l3mdev
net: ipv6: Remove l3mdev_get_saddr6
2016-09-10 23:12:53 -07:00
lapb
net/lapb: tuse %*ph to dump buffers
2016-05-29 22:33:25 -07:00
llc
net: fix sleeping for sk_wait_event()
2016-11-14 13:17:21 -05:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
mac802154
mac802154: use rate limited warnings for malformed frames
2016-09-19 20:19:34 +02:00
mpls
lwt: Remove unused len field
2016-10-23 17:45:01 -04:00
ncsi
net/ncsi: Improve HNCDSC AEN handler
2016-10-20 11:23:08 -04:00
netfilter
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
netlabel
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
netlink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-15 10:54:36 -05:00
netrom
…
nfc
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
openvswitch
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
packet
af_packet: Use virtio_net_hdr_from_skb() directly.
2016-11-19 10:37:03 -05:00
phonet
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
qrtr
Merge tag 'qcom-soc-for-4.7-2' into net-next
2016-05-17 14:11:19 -04:00
rds
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
rfkill
rfkill: Use switch to demux userspace operations
2016-04-05 10:48:53 +02:00
rose
rose: limit sk_filter trim to payload
2016-07-13 11:53:40 -07:00
rxrpc
udp: do fwd memory scheduling on dequeue
2016-11-07 13:24:41 -05:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-26 23:42:21 -05:00
sctp
sctp: use new rhlist interface on sctp transport rhashtable
2016-11-16 23:22:17 -05:00
strparser
strparser: Propagate correct error code in strp_recv()
2016-10-12 01:51:49 -04:00
sunrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
switchdev
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
tipc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-26 23:42:21 -05:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
vmw_vsock
VSOCK: add loopback to virtio_transport
2016-11-24 11:53:15 -05:00
wimax
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
x25
net: x25: remove null checks on arrays calling_ae and called_ae
2016-09-09 18:13:30 -07:00
xfrm
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2016-10-28 13:26:27 -04:00
compat.c
packet: compat support for sock_fprog
2016-06-09 23:41:03 -07:00
Kconfig
strparser: Stream parser for messages
2016-08-17 19:36:23 -04:00
Makefile
strparser: Stream parser for messages
2016-08-17 19:36:23 -04:00
socket.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
sysctl_net.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-10-06 09:52:23 -07:00