David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-08-18 01:17:32 -04:00

..

ila

kcm: Use stream parser

2016-08-17 19:36:23 -04:00

netfilter

netfilter: x_tables: speed up jump target validation

2016-07-18 21:35:23 +02:00

addrconf_core.c

…

addrconf.c

net: ipv6: Do not keep IPv6 addresses when IPv6 is disabled

2016-08-13 15:14:00 -07:00

addrlabel.c

ipv6/addrlabel: fix ip6addrlbl_get()

2015-12-22 15:57:54 -05:00

af_inet6.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2016-07-29 17:38:46 -07:00

ah6.c

…

anycast.c

…

calipso.c

calipso: fix resource leak on calipso_genopt failure

2016-08-13 14:56:17 -07:00

datagram.c

sock: propagate __sock_cmsg_send() error

2016-05-16 13:46:23 -04:00

esp6.c

…

exthdrs_core.c

ipv6: constify the skb pointer of ipv6_find_tlv().

2016-06-27 15:06:15 -04:00

exthdrs_offload.c

…

exthdrs.c

Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

2016-07-07 10:15:34 +10:00

fib6_rules.c

net: Add l3mdev rule

2016-06-08 11:36:02 -07:00

fou6.c

fou: add Kconfig options for IPv6 support

2016-05-29 22:24:21 -07:00

icmp.c

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

2016-06-30 05:03:36 -04:00

inet6_connection_sock.c

soreuseport: fast reuseport TCP socket selection

2016-02-11 03:54:15 -05:00

inet6_hashtables.c

net: rename NET_{ADD|INC}_STATS_BH()

2016-04-27 22:48:24 -04:00

ip6_checksum.c

ipv6: fix checksum annotation in udp6_csum_init

2016-06-14 15:26:42 -04:00

ip6_fib.c

ipv6: Fix mem leak in rt6i_pcpu

2016-07-05 14:09:23 -07:00

ip6_flowlabel.c

ipv6: add new struct ipcm6_cookie

2016-05-03 16:08:14 -04:00

ip6_gre.c

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

2016-08-18 01:17:32 -04:00

ip6_icmp.c

ipv6: icmp: add a force_saddr param to icmp6_send()

2016-06-18 22:11:38 -07:00

ip6_input.c

net: vrf: ipv6 support for local traffic to local addresses

2016-06-08 00:25:38 -07:00

ip6_offload.c

ip4ip6: Support for GSO/GRO

2016-05-20 18:03:17 -04:00

ip6_offload.h

udp: Add GRO functions to UDP socket

2016-04-07 16:53:29 -04:00

ip6_output.c

net: vrf: Implement get_saddr for IPv6

2016-06-17 21:25:29 -07:00

ip6_tunnel.c

net: resolve symbol conflicts with generic hashtable.h

2016-08-10 17:18:52 -07:00

ip6_udp_tunnel.c

ip_tunnel: add support for setting flow label via collect metadata

2016-03-11 15:14:26 -05:00

ip6_vti.c

net: resolve symbol conflicts with generic hashtable.h

2016-08-10 17:18:52 -07:00

ip6mr.c

net: ipmr/ip6mr: update lastuse on entry change

2016-07-26 15:18:31 -07:00

ipcomp6.c

…

ipv6_sockglue.c

Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

2016-07-07 10:15:34 +10:00

Kconfig

fou: fix IPv6 Kconfig options

2016-05-31 14:07:49 -07:00

Makefile

Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

2016-07-07 10:15:34 +10:00

mcast_snoop.c

…

mcast.c

net/multicast: should not send source list records when have filter mode change

2016-08-08 16:04:39 -07:00

mip6.c

…

ndisc.c

ipv6: export several functions

2016-06-15 20:41:23 -07:00

netfilter.c

…

output_core.c

…

ping.c

net: ipv6: Fix ping to link-local addresses.

2016-08-15 12:19:09 -07:00

proc.c

…

protocol.c

…

raw.c

ipv6: use TOS marks from sockets for routing decision

2016-06-11 15:33:26 -07:00

reassembly.c

ipv6: rename IP6_INC_STATS_BH()

2016-04-27 22:48:24 -04:00

route.c

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

2016-06-30 05:03:36 -04:00

sit.c

sit: make function ipip6_valid_ip_proto() static

2016-08-12 21:52:18 -07:00

syncookies.c

net: rename NET_{ADD|INC}_STATS_BH()

2016-04-27 22:48:24 -04:00

sysctl_net_ipv6.c

calipso: Add a label cache.

2016-06-27 15:06:17 -04:00

tcp_ipv6.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2016-07-29 17:38:46 -07:00

tcpv6_offload.c

…

tunnel6.c

…

udp_impl.h

…

udp_offload.c

gso: Remove arbitrary checks for unsupported GSO

2016-05-20 18:03:15 -04:00

udp.c

udp: use sk_filter_trim_cap for udp{,6}_queue_rcv_skb

2016-07-25 21:40:33 -07:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

ipv6: update skb->csum when CE mark is propagated

2016-01-15 15:07:23 -05:00

xfrm6_output.c

…

xfrm6_policy.c

net: xfrm: fix old-style declaration

2016-06-16 22:06:30 -07:00

xfrm6_protocol.c

…

xfrm6_state.c

…

xfrm6_tunnel.c

…