David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
6lowpan	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
9p	make sock_alloc_file() do sock_release() on failures	2017-12-05 18:39:29 -05:00
802	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-12 09:17:05 +09:00
appletalk	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
atm	atm: mpoa: remove 32-bit timekeeping	2017-11-30 09:26:32 -05:00
ax25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
batman-adv	batman-adv: Convert packet.h to uapi header	2017-12-21 15:35:53 -05:00
bluetooth	Bluetooth: introduce DEFINE_SHOW_ATTRIBUTE() macro	2017-12-13 20:20:34 +01:00
bpf
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
caif	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
can	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
ceph	We have a set of file locking improvements from Zheng, rbd rw/ro	2017-11-21 05:38:32 -10:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
dcb
dccp	net: tracepoint: using sock_set_state tracepoint to trace DCCP state transition	2017-12-20 14:00:25 -05:00
decnet	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
dns_resolver
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
ethernet
hsr
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
ipx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
iucv
kcm	make sock_alloc_file() do sock_release() on failures	2017-12-05 18:39:29 -05:00
key	af_key: replace BUG_ON on WARN_ON in net_exit hook	2017-11-14 15:45:52 +09:00
l2tp	l2tp: add peer_offset parameter	2017-12-27 12:11:51 -05:00
l3mdev
lapb	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
llc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-11-15 11:56:19 -08:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
mpls	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
ncsi	net/ncsi: Don't take any action on HNCDSC AEN	2017-12-18 14:50:11 -05:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
netlabel	net/netlabel: Add list_next_rcu() in rcu_dereference().	2017-11-18 10:32:41 +09:00
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
netrom	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
nfc	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
nsh	openvswitch: enable NSH support	2017-11-08 16:12:33 +09:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
packet	net: Add asynchronous callbacks for xfrm on layer 2.	2017-12-20 10:41:36 +01:00
phonet	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
psample
qrtr	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
rfkill
rose	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
rxrpc	rxrpc: Use correct netns source in rxrpc_release_sock()	2017-12-03 10:05:20 -05:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
smc	smc: support variable CLC proposal messages	2017-12-07 15:03:12 -05:00
strparser	strparser: Call sock_owned_by_user_nocheck	2017-12-28 14:28:22 -05:00
sunrpc	NFS client fixes for Linux 4.15-rc4	2017-12-16 13:12:53 -08:00
switchdev	net: bridge: Add/del switchdev object on host join/leave	2017-11-10 13:41:40 +09:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
tls	tls: don't override sk_write_space if tls_set_sw_offload fails.	2017-11-14 16:26:35 +09:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
vmw_vsock	VSOCK: fix outdated sk_state value in hvs_release()	2017-12-05 15:07:37 -05:00
wimax	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
wireless	cfg80211: ship certificates as hex files	2017-12-19 09:28:01 +01:00
x25	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
compat.c
Kconfig
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
socket.c	sock: Move the socket inuse to namespace.	2017-12-19 09:58:14 -05:00
sysctl_net.c