Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 17:43:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net
History
David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-17 22:08:28 -05:00
..
6lowpan
6lowpan: add debugfs support
2015-12-10 01:25:25 +01:00
9p
IB/cma: Add support for network namespaces
2015-10-28 12:32:48 -04:00
802
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
8021q
net: Rename NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK
2015-12-15 16:50:08 -05:00
appletalk
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
atm
net: Generalise wq_has_sleeper helper
2015-11-30 14:47:33 -05:00
ax25
net: add validation for the socket syscall protocol argument
2015-12-14 16:09:30 -05:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
bridge
switchdev: Pass original device to port netdev driver
2015-12-15 11:58:20 -05:00
caif
net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA
2015-12-01 15:45:05 -05:00
can
can: avoid using timeval for uapi
2015-10-13 17:42:34 +02:00
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2015-11-13 09:24:40 -08:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
dcb
net/dcb: make dcbnl.c explicitly non-modular
2015-10-09 07:52:27 -07:00
dccp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-03 21:09:12 -05:00
decnet
net: add validation for the socket syscall protocol argument
2015-12-14 16:09:30 -05:00
dns_resolver
net: dns_resolver: convert time_t to time64_t
2015-11-18 16:27:46 -05:00
dsa
net: dsa: move dsa slave destroy code to slave.c
2015-12-07 16:35:50 -05:00
ethernet
net: help compiler generate better code in eth_get_headlen
2015-09-28 22:51:15 -07:00
hsr
net/hsr: fix a warning message
2015-11-23 14:56:15 -05:00
ieee802154
6lowpan: add lowpan dev register helpers
2015-12-10 01:25:25 +01:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
ipx
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
irda
net: add validation for the socket syscall protocol argument
2015-12-14 16:09:30 -05:00
iucv
iucv: call skb_linearize() when needed
2015-12-14 16:16:44 -05:00
key
af_key: fix two typos
2015-10-23 03:05:19 -07:00
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-03 21:09:12 -05:00
l3mdev
net: Add netif_is_l3_slave
2015-10-07 04:27:43 -07:00
lapb
…
llc
tcp: fix recv with flags MSG_WAITALL | MSG_PEEK
2015-07-27 01:06:53 -07:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
mac802154
mac802154: tx: fix synced xmit deadlock
2015-12-10 19:17:11 +01:00
mpls
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
netlabel
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
netlink
netlink: add a start callback for starting a netlink dump
2015-12-15 23:25:20 -05:00
netrom
netfilter: Remove spurios included of netfilter.h
2015-06-18 21:14:32 +02:00
nfc
net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA
2015-12-01 15:45:05 -05:00
openvswitch
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
packet
packet: Allow packets with only a header (but no payload)
2015-11-29 22:17:17 -05:00
phonet
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
rds
RDS: fix race condition when sending a message on unbound socket
2015-11-24 17:20:09 -05:00
rfkill
rfkill: copy the name into the rfkill struct
2015-12-10 10:37:51 +01:00
rose
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-24 02:58:51 -07:00
rxrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-03 21:09:12 -05:00
sched
net_sched: make qdisc_tree_decrease_qlen() work for non mq
2015-12-15 13:41:52 -05:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
sunrpc
sched/wait: Fix the signal handling fix
2015-12-13 14:30:59 -08:00
switchdev
switchdev: Pass original device to port netdev driver
2015-12-15 11:58:20 -05:00
tipc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-03 21:09:12 -05:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
vmw_vsock
Revert "Merge branch 'vsock-virtio'"
2015-12-08 21:55:49 -05:00
wimax
net:wimax: Fix doucble word "the the" in networking.xml
2015-08-09 22:43:52 -07:00
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
x25
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
xfrm
xfrm: add rcu protection to sk->sk_policy[]
2015-12-11 19:22:06 -05:00
compat.c
net: switch importing msghdr from userland to {compat_,}import_iovec()
2015-04-09 00:02:26 -04:00
Kconfig
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
Makefile
net: Introduce L3 Master device abstraction
2015-09-29 20:40:32 -07:00
socket.c
net: fix uninitialized variable issue
2015-12-15 15:46:48 -05:00
sysctl_net.c
net: sysctl: fix a kmemleak warning
2015-10-23 06:22:08 -07:00