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

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

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

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

..

ila

ila: autoload module

2016-02-21 22:00:28 -05:00

netfilter

netfilter: conntrack: resched in nf_ct_iterate_cleanup

2016-02-01 00:15:26 +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

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

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

addrlabel.c

ipv6/addrlabel: fix ip6addrlbl_get()

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

af_inet6.c

sock: struct proto hash function may error

2016-02-11 03:54:14 -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/udp: use sticky pktinfo egress ifindex on connect()

2016-01-29 20:31:26 -08: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

inet6_connection_sock.c

soreuseport: fast reuseport TCP socket selection

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

inet6_hashtables.c

soreuseport: fast reuseport TCP socket selection

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

ip6_checksum.c

net: udp: always set up for CHECKSUM_PARTIAL offload

2016-02-12 05:52:15 -05: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: fix a lockdep splat

2016-02-08 10:33:32 -05:00

ip6_gre.c

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

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

ip6_icmp.c

…

ip6_input.c

ipv4: namespacify ip_early_demux sysctl knob

2016-02-16 20:42:54 -05:00

ip6_offload.c

ipv6: gro: support sit protocol

2015-10-21 19:36:11 -07:00

ip6_offload.h

…

ip6_output.c

ipv6: enforce flowi6_oif usage in ip6_dst_lookup_tail()

2016-01-29 20:31:26 -08:00

ip6_tunnel.c

net: replace dst_cache ip6_tunnel implementation with the generic one

2016-02-16 20:21:48 -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: replace dst_cache ip6_tunnel implementation with the generic one

2016-02-16 20:21:48 -05:00

ip6mr.c

net: ipmr, ip6mr: fix vif/tunnel failure race condition

2015-11-24 17:15:56 -05:00

ipcomp6.c

…

ipv6_sockglue.c

ipv6: add complete rcu protection around np->opt

2015-12-02 23:37:16 -05:00

Kconfig

net: replace dst_cache ip6_tunnel implementation with the generic one

2016-02-16 20:21:48 -05:00

Makefile

ila: Create net/ipv6/ila directory

2015-12-15 23:25:20 -05: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

ipv6: add option to drop unsolicited neighbor advertisements

2016-02-11 04:27:36 -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

…

protocol.c

…

raw.c

ipv6: add IPV6_HDRINCL option for raw sockets

2015-12-17 15:12:28 -05:00

reassembly.c

net: use skb_postpush_rcsum instead of own implementations

2016-02-19 23:43:10 -05:00

route.c

ipv6: enforce flowi6_oif usage in ip6_dst_lookup_tail()

2016-01-29 20:31:26 -08:00

sit.c

iptunnel: scrub packet in iptunnel_pull_header

2016-02-18 14:34:54 -05:00

syncookies.c

ipv4: Namespaceify tcp syncookies sysctl knob

2016-02-07 14:35:10 -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

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

tcpv6_offload.c

…

tunnel6.c

ipv6: fix tunnel error handling

2015-11-03 10:52:13 -05:00

udp_impl.h

…

udp_offload.c

ipv6: hash net ptr into fragmentation bucket selection

2015-03-25 14:07:04 -04:00

udp.c

ipv6: pass up EMSGSIZE msg for UDP socket in Ipv6

2016-02-19 15:46:24 -05:00

udplite.c

…

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

…

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

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

2015-12-22 16:26:31 -05:00

xfrm6_protocol.c

…

xfrm6_state.c

…

xfrm6_tunnel.c

…