Mauro (mdrjr) Ribeiro 0bdda8a264 net/ipv6: fix a merge conflict ...

Change-Id: I05840f8be0301d073965e4e8c6c12c5bf9c2c5ad

2019-08-29 18:32:34 -03:00

..

ila

…

netfilter

netfilter: ipv6: nf_defrag: accept duplicate fragments again

2019-07-21 09:05:53 +02:00

addrconf_core.c

…

addrconf.c

Merge tag 'v4.9.160' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-02-25 05:49:52 -03:00

addrlabel.c

…

af_inet6.c

Merge tag 'v4.9.155' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-02-13 20:10:25 -02:00

ah6.c

Merge 4.9.94 into android-4.9

2018-04-14 15:40:56 +02:00

anycast.c

…

calipso.c

ipv6: make ipv6_renew_options() interrupt/kernel safe

2018-08-24 13:12:36 +02:00

datagram.c

Merge tag 'v4.9.152' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-02-13 20:10:04 -02:00

esp6.c

Merge 4.9.94 into android-4.9

2018-04-14 15:40:56 +02:00

exthdrs_core.c

…

exthdrs_offload.c

…

exthdrs.c

ipv6: make ipv6_renew_options() interrupt/kernel safe

2018-08-24 13:12:36 +02:00

fib6_rules.c

…

fou6.c

…

icmp.c

…

inet6_connection_sock.c

…

inet6_hashtables.c

…

ip6_checksum.c

net: udp: fix handling of CHECKSUM_COMPLETE packets

2018-11-10 07:42:58 -08:00

ip6_fib.c

…

ip6_flowlabel.c

ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero

2019-06-22 08:17:21 +02:00

ip6_gre.c

Merge 4.9.94 into android-4.9

2018-04-14 15:40:56 +02:00

ip6_icmp.c

…

ip6_input.c

…

ip6_offload.c

gso_segment: Reset skb->mac_len after modifying network header

2018-09-29 03:07:32 -07:00

ip6_offload.h

…

ip6_output.c

Merge tag 'v4.9.169' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-04-25 19:25:24 -03:00

ip6_tunnel.c

net/ipv6: fix a merge conflict

2019-08-29 18:32:34 -03:00

ip6_udp_tunnel.c

ipv6: explicitly initialize udp6_addr in udp_sock_create6()

2019-01-09 16:16:40 +01:00

ip6_vti.c

Merge tag 'v4.9.149' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-02-13 20:06:12 -02:00

ip6mr.c

ipv6: check sk sk_type and protocol early in ip_mroute_set/getsockopt

2019-08-04 09:33:43 +02:00

ipcomp6.c

…

ipv6_sockglue.c

ipv6: make ipv6_renew_options() interrupt/kernel safe

2018-08-24 13:12:36 +02:00

Kconfig

…

Makefile

…

mcast_snoop.c

…

mcast.c

ipv6: mcast: fix a use-after-free in inet6_mc_check

2018-11-10 07:42:57 -08:00

mip6.c

…

ndisc.c

Merge tag 'v4.9.136' into odroidn2-4.9.y

2018-11-28 18:58:37 +09:00

netfilter.c

…

output_core.c

inet: switch IP ID generator to siphash

2019-08-25 10:51:42 +02:00

ping.c

…

proc.c

inet: frags: break the 2GB limit for frags storage

2018-10-18 09:13:24 +02:00

protocol.c

…

raw.c

Merge tag 'v4.9.181' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-06-18 13:44:50 -03:00

reassembly.c

net: IP6 defrag: use rbtrees for IPv6 defrag

2019-05-02 09:32:06 +02:00

route.c

clean up compiler warnings

2019-07-23 17:52:49 +09:00

sit.c

vrf: sit mtu should not be updated when vrf netdev is the link

2019-05-16 19:43:46 +02:00

syncookies.c

…

sysctl_net_ipv6.c

…

tcp_ipv6.c

Merge tag 'v4.9.167' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-04-16 11:35:04 -03:00

tcpv6_offload.c

gso: validate gso_type in GSO handlers

2018-01-31 12:55:55 +01:00

tunnel6.c

…

udp_impl.h

…

udp_offload.c

gso: validate gso_type in GSO handlers

2018-01-31 12:55:55 +01:00

udp.c

Merge tag 'v4.9.185' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidn2-4.9.y

2019-07-15 12:29:18 -03:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

…

xfrm6_output.c

xfrm6: call kfree_skb when skb is toobig

2018-11-10 07:42:41 -08:00

xfrm6_policy.c

Merge 4.9.110 into android-4.9

2018-06-26 09:32:02 +08:00

xfrm6_protocol.c

…

xfrm6_state.c

…

xfrm6_tunnel.c

xfrm6_tunnel: Fix potential panic when unloading xfrm6_tunnel module

2019-05-25 18:26:54 +02:00