Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-next/net
History
David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/Makefile
	net/ipv6/sysctl_net_ipv6.c

Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.

In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-05 18:46:26 -07:00
..
6lowpan
Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-08-05 13:18:20 -07:00
9p
9P: remove unnecessary break after return
2014-07-15 16:27:00 -07:00
802
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
8021q
vlan: fail early when creating netdev named config
2014-07-29 11:43:50 -07:00
appletalk
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-07-16 14:09:34 -07:00
atm
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
ax25
net: Fix use after free by removing length arg from sk_data_ready callbacks.
2014-04-11 16:15:36 -04:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
bluetooth
Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-08-05 13:18:20 -07:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
caif
caif: remove unnecessary break after goto
2014-07-15 16:27:01 -07:00
can
can: add hash based access to single EFF frame filters
2014-05-19 09:38:24 +02:00
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2014-06-12 23:06:23 -07:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
dcb
dcbnl : Fix misleading dcb_app->priority explanation
2014-07-30 17:21:05 -07:00
dccp
inet: move ipv6only in sock_common
2014-07-01 23:46:21 -07:00
decnet
net: Split sk_no_check into sk_no_check_{rx,tx}
2014-05-23 16:28:53 -04:00
dns_resolver
dns_resolver: Null-terminate the right string
2014-07-20 22:33:32 -07:00
dsa
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
ethernet
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
hsr
net/hsr: Remove left-over never-true conditional code.
2014-07-11 15:04:40 -07:00
ieee802154
inet: frags: use kmem_cache for inet_frag_queue
2014-08-02 15:31:31 -07:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
ipx
net: Split sk_no_check into sk_no_check_{rx,tx}
2014-05-23 16:28:53 -04:00
irda
irda: remove unnecessary break after return
2014-07-15 16:27:01 -07:00
iucv
af_iucv: avoid path quiesce of severed path in shutdown()
2014-07-21 20:21:40 -07:00
key
af_key: remove unnecessary break after return
2014-07-15 16:27:00 -07:00
l2tp
net: use inet6_iif instead of IP6CB()->iif
2014-07-31 22:37:06 -07:00
lapb
net/lapb: re-send packets on timeout
2013-09-23 16:52:45 -04:00
llc
llc: remove noisy WARN from llc_mac_hdr_init
2014-01-28 18:01:32 -08:00
mac80211
Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-07-28 17:36:25 -07:00
mac802154
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
mpls
gre: Call gso_make_checksum
2014-06-04 22:46:38 -07:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
netlabel
netlabel: remove unnecessary break after goto
2014-07-15 16:27:00 -07:00
netlink
netlink: fix lockdep splats
2014-08-04 22:58:06 -07:00
netrom
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
nfc
Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-08-05 13:18:20 -07:00
openvswitch
net: Remove unlikely() for WARN_ON() conditions
2014-07-30 17:41:47 -07:00
packet
packet: remove deprecated syststamp timestamp
2014-07-29 11:39:50 -07:00
phonet
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
rds
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
rfkill
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2014-05-22 13:58:36 -04:00
rose
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
rxrpc
net/rxrpc/ar-key.c: drop negativity check on unsigned value
2014-07-20 21:25:56 -07:00
sched
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
sunrpc
NFSv4: test SECINFO RPC_AUTH_GSS pseudoflavors for support
2014-06-24 18:46:58 -04:00
tipc
tipc: remove duplicated include from socket.c
2014-07-29 15:51:14 -07:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
vmw_vsock
vsock: Make transport the proto owner
2014-05-05 13:13:50 -04:00
wimax
wimax: remove dead code
2013-11-21 13:09:42 -05:00
wireless
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-07-25 10:22:36 -04:00
x25
net: Fix use after free by removing length arg from sk_data_ready callbacks.
2014-04-11 16:15:36 -04:00
xfrm
xfrm: Fix installation of AH IPsec SAs
2014-06-30 07:42:12 +02:00
compat.c
net: sendmsg: fix NULL pointer dereference
2014-07-29 12:20:22 -07:00
Kconfig
6lowpan: introduce new net/6lowpan directory
2014-07-12 01:53:30 +02:00
Makefile
6lowpan: introduce new net/6lowpan directory
2014-07-12 01:53:30 +02:00
nonet.c
…
socket.c
net-timestamp: ACK timestamp for bytestreams
2014-08-05 16:35:54 -07:00
sysctl_net.c
net: Update the sysctl permissions handler to test effective uid/gid
2013-10-07 15:57:56 -04:00