android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_kernel_samsung_sm8650/net/ipv6
History
Pablo Neira Ayuso a4ec80082c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 
Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Conflicts:
	net/ipv6/netfilter/nf_conntrack_reasm.c
2015-12-14 20:31:16 +01:00
..
netfilter
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-12-14 20:31:16 +01:00
addrconf_core.c
ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument
2015-07-31 15:21:30 -07:00
addrconf.c
ipv6: Only act upon NETDEV_*_TYPE_CHANGE if we have ipv6 addresses
2015-12-05 17:41:42 -05:00
addrlabel.c
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
af_inet6.c
ipv6: kill sk_dst_lock
2015-12-03 11:32:06 -05:00
ah6.c
ah6: fix error return code
2015-08-25 13:37:31 -07:00
anycast.c
ipv6: coding style: comparison for equality with NULL
2015-03-31 13:51:54 -04:00
datagram.c
ipv6: add complete rcu protection around np->opt
2015-12-02 23:37:16 -05:00
esp6.c
esp6: Switch to new AEAD interface
2015-05-28 11:23:20 +08:00
exthdrs_core.c
ipv6: coding style: comparison for equality with NULL
2015-03-31 13:51:54 -04:00
exthdrs_offload.c
ipv6: fix exthdrs offload registration in out_rt path
2015-09-02 15:31:00 -07:00
exthdrs.c
ipv6: add complete rcu protection around np->opt
2015-12-02 23:37:16 -05:00
fib6_rules.c
ipv6: fix the incorrect return value of throw route
2015-10-23 02:38:18 -07:00
icmp.c
ipv6: kill sk_dst_lock
2015-12-03 11:32:06 -05:00
ila.c
dst: Pass net into dst->output
2015-10-08 04:27:03 -07:00
inet6_connection_sock.c
ipv6: kill sk_dst_lock
2015-12-03 11:32:06 -05:00
inet6_hashtables.c
net: SO_INCOMING_CPU setsockopt() support
2015-10-12 19:28:20 -07:00
ip6_checksum.c
udp: Generic functions to set checksum
2014-06-04 22:46:38 -07:00
ip6_fib.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-24 06:54:12 -07:00
ip6_flowlabel.c
ipv6: Flow label state ranges
2015-05-03 21:58:01 -04:00
ip6_gre.c
net: remove unnecessary mroute.h includes
2015-11-30 15:26:21 -05:00
ip6_icmp.c
ipv6: White-space cleansing : Line Layouts
2014-08-24 22:37:52 -07:00
ip6_input.c
netfilter: Pass net into okfn
2015-09-17 17:18:37 -07:00
ip6_offload.c
ipv6: gro: support sit protocol
2015-10-21 19:36:11 -07:00
ip6_offload.h
ipv6: Pull IPv6 GSO registration out of the module
2012-11-15 17:39:24 -05:00
ip6_output.c
ipv6: add defensive check for CHECKSUM_PARTIAL skbs in ip_fragment
2015-11-01 12:01:28 -05:00
ip6_tunnel.c
net/ip6_tunnel: fix dst leak
2015-11-18 16:25:01 -05:00
ip6_udp_tunnel.c
vxlan: do not receive IPv4 packets on IPv6 socket
2015-08-29 13:07:54 -07:00
ip6_vti.c
net: Pass net into dst_output and remove dst_output_okfn
2015-10-08 04:26:54 -07:00
ip6mr.c
net: ipmr, ip6mr: fix vif/tunnel failure race condition
2015-11-24 17:15:56 -05:00
ipcomp6.c
ipv6: White-space cleansing : Structure layouts
2014-08-24 22:37:52 -07:00
ipv6_sockglue.c
ipv6: add complete rcu protection around np->opt
2015-12-02 23:37:16 -05:00
Kconfig
net: Identifier Locator Addressing module
2015-08-17 21:33:06 -07:00
Makefile
net: Identifier Locator Addressing module
2015-08-17 21:33:06 -07:00
mcast_snoop.c
net: fix wrong skb_get() usage / crash in IGMP/MLD parsing code
2015-08-13 17:08:39 -07:00
mcast.c
snmp: Remove duplicate OUTMCAST stat increment
2015-11-16 16:36:32 -05:00
mip6.c
ipv6: use ktime_t for internal timestamps
2015-10-05 03:16:47 -07:00
ndisc.c
Revert "ipv6: ndisc: inherit metadata dst when creating ndisc requests"
2015-12-01 15:07:59 -05:00
netfilter.c
ipv6: Pass struct net into ip6_route_me_harder
2015-09-29 20:21:32 +02:00
output_core.c
ipv4, ipv6: Pass net into ip_local_out and ip6_local_out
2015-10-08 04:27:02 -07:00
ping.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
proc.c
udp: Increment UDP_MIB_IGNOREDMULTI for arriving unmatched multicasts
2014-11-07 15:45:50 -05:00
protocol.c
net: Export inet_offloads and inet6_offloads
2014-09-19 17:15:31 -04:00
raw.c
ipv6: add complete rcu protection around np->opt
2015-12-02 23:37:16 -05:00
reassembly.c
ipv6: distinguish frag queues by device for multicast and link-local packets
2015-11-24 16:45:47 -05:00
route.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-03 21:09:12 -05:00
sit.c
sit: fix sit0 percpu double allocations
2015-11-02 22:54:45 -05:00
syncookies.c
ipv6: add complete rcu protection around np->opt
2015-12-02 23:37:16 -05:00
sysctl_net_ipv6.c
ipv6: Implement different admin modes for automatic flow labels
2015-07-31 17:07:11 -07:00
tcp_ipv6.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-03 21:09:12 -05:00
tcpv6_offload.c
tcp: cleanup static functions
2015-02-28 16:56:51 -05:00
tunnel6.c
ipv6: fix tunnel error handling
2015-11-03 10:52:13 -05:00
udp_impl.h
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
udp_offload.c
ipv6: hash net ptr into fragmentation bucket selection
2015-03-25 14:07:04 -04:00
udp.c
ipv6: add complete rcu protection around np->opt
2015-12-02 23:37:16 -05:00
udplite.c
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
xfrm6_input.c
netfilter: Pass struct net into the netfilter hooks
2015-09-17 17:18:37 -07:00
xfrm6_mode_beet.c
xfrm: simplify xfrm_address_t use
2015-03-31 13:58:35 -04:00
xfrm6_mode_ro.c
ipv4/ipv6: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
xfrm6_mode_transport.c
…
xfrm6_mode_tunnel.c
xfrm6: Fix IPv6 ECN decapsulation
2015-08-11 12:41:34 +02:00
xfrm6_output.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-24 06:54:12 -07:00
xfrm6_policy.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2015-10-30 20:51:56 +09:00
xfrm6_protocol.c
xfrm6: Properly handle unsupported protocols
2014-05-06 07:08:38 +02:00
xfrm6_state.c
ipv6: White-space cleansing : Line Layouts
2014-08-24 22:37:52 -07:00
xfrm6_tunnel.c
ipv6: White-space cleansing : gaps between function and symbol export
2014-08-24 22:37:52 -07:00