kernel_linux

mirror of https://gitee.com/openharmony/kernel_linux synced 2025-04-01 22:52:29 +00:00

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

af_unix.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00

diag.c

VFS: net/unix: d_backing_inode() annotations

2015-04-15 15:06:56 -04:00

garbage.c

net: unix: garbage: fixed several comment and whitespace style issues

2015-04-23 13:15:20 -04:00

Kconfig

net: Default UDP and UNIX diag to 'n'.