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

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

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

2017-08-09 16:28:45 -07:00

..

ila

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

2017-06-15 11:59:32 -04:00

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2017-06-30 06:27:09 -07:00

addrconf_core.c

Ipvlan should return an error when an address is already in use.

2017-06-09 12:26:07 -04:00

addrconf.c

ipv6: Regenerate host route according to node pointer upon interface up

2017-08-03 15:36:00 -07:00

addrlabel.c

net, ipv6: convert ip6addrlbl_entry.refcnt from atomic_t to refcount_t

2017-07-04 01:29:04 -07:00

af_inet6.c

ipv6: Avoid going through ->sk_net to access the netns

2017-07-31 18:01:33 -07:00

ah6.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2017-06-23 14:17:31 -04:00

anycast.c

net, ipv6: convert ifacaddr6.aca_refcnt from atomic_t to refcount_t

2017-07-04 01:29:04 -07:00

calipso.c

net, calipso: convert calipso_doi.refcount from atomic_t to refcount_t

2017-07-04 22:35:16 +01:00

datagram.c

net: convert sock.sk_refcnt from atomic_t to refcount_t

2017-07-01 07:39:08 -07:00

esp6_offload.c

esp6_offload: Fix IP6CB(skb)->nhoff for ESP GRO

2017-06-22 10:49:14 +02:00

esp6.c

net: convert sock.sk_wmem_alloc from atomic_t to refcount_t

2017-07-01 07:39:08 -07:00

exthdrs_core.c

…

exthdrs_offload.c

…

exthdrs.c

ipv6: sr: allow SRH insertion with arbitrary segments_left value

2017-08-07 14:16:21 -07:00

fib6_notifier.c

ipv6: fib: Dump tables during registration to FIB chain

2017-08-03 15:36:00 -07:00

fib6_rules.c

net: ipv6: avoid overhead when no custom FIB rules are installed

2017-08-08 21:40:08 -07:00

fou6.c

fou: make local function static

2017-05-21 13:42:36 -04:00

icmp.c

net: don't global ICMP rate limit packets originating from loopback

2017-06-14 15:33:58 -04:00

inet6_connection_sock.c

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

2017-01-28 10:33:06 -05:00

inet6_hashtables.c

net: ipv6: add second dif to inet6 socket lookups

2017-08-07 11:39:22 -07:00

ip6_checksum.c

…

ip6_fib.c

ipv6: fib: Add helpers to hold / drop a reference on rt6_info

2017-08-03 15:36:00 -07:00

ip6_flowlabel.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

ip6_gre.c

Revert "ipv6: constify inet6_protocol structures"

2017-08-01 10:03:17 -07:00

ip6_icmp.c

…

ip6_input.c

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

2017-04-20 10:35:33 -04:00

ip6_offload.c

ipv6: Fix leak in ipv6_gso_segment().

2017-06-04 21:41:10 -04:00

ip6_offload.h

…

ip6_output.c

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

2017-08-01 10:07:50 -07:00

ip6_tunnel.c

net: add netlink_ext_ack argument to rtnl_link_ops.validate

2017-06-26 23:13:22 -04:00

ip6_udp_tunnel.c

ip6_udp_tunnel: remove unused IPCB related codes

2016-11-02 15:18:36 -04:00

ip6_vti.c

vti: revert flush x-netns xfrm cache when vti interface is removed

2017-07-18 11:13:41 -07:00

ip6mr.c

ip6mr: add netlink notifications on mrt6msg cache reports

2017-06-21 11:22:53 -04:00

ipcomp6.c

net: inet: Support UID-based routing in IP protocols.

2016-11-04 14:45:23 -04:00

ipv6_sockglue.c

Merge branch 'work.memdup_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-07-05 16:05:24 -07:00

Kconfig

ipv6: sr: define core operations for seg6local lightweight tunnel

2017-08-07 14:16:22 -07:00

Makefile

ipv6: sr: define core operations for seg6local lightweight tunnel

2017-08-07 14:16:22 -07:00

mcast_snoop.c

…

mcast.c

net, ipv6: convert ifmcaddr6.mca_refcnt from atomic_t to refcount_t

2017-07-04 01:29:04 -07:00

mip6.c

ktime: Get rid of ktime_equal()

2016-12-25 17:21:23 +01:00

ndisc.c

networking: make skb_put & friends return void pointers

2017-06-16 11:48:39 -04:00

netfilter.c

net: inet: Support UID-based routing in IP protocols.

2016-11-04 14:45:23 -04:00

output_core.c

ipv6: avoid overflow of offset in ip6_find_1stfragopt

2017-07-19 22:50:14 -07:00

ping.c

net: ping: do not abuse udp_poll()

2017-06-04 22:56:55 -04:00

proc.c

proc: snmp6: Use correct type in memset

2017-06-12 09:53:14 -04:00

protocol.c

net: Add sysctl to toggle early demux for tcp and udp

2017-03-24 13:17:07 -07:00

raw.c

net: ipv6: add second dif to raw socket lookups

2017-08-07 11:39:22 -07:00

reassembly.c

ipv6: on reassembly, record frag_max_size

2016-11-03 15:41:11 -04:00

route.c

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

2017-08-09 16:28:45 -07:00

seg6_hmac.c

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

2017-02-07 16:29:30 -05:00

seg6_iptunnel.c

ipv6: sr: export SRH insertion functions

2017-08-07 14:16:21 -07:00

seg6_local.c

ipv6: sr: implement several seg6local actions

2017-08-07 14:16:22 -07:00

seg6.c

ipv6: sr: define core operations for seg6local lightweight tunnel

2017-08-07 14:16:22 -07:00

sit.c

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

2017-06-30 12:43:08 -04:00

syncookies.c

ipv4: ipv6: initialize treq->txhash in cookie_v[46]_check()

2017-07-18 11:22:51 -07:00

sysctl_net_ipv6.c

calipso: Add a label cache.

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

tcp_ipv6.c

net: ipv6: add second dif to inet6 socket lookups

2017-08-07 11:39:22 -07:00

tcpv6_offload.c

…

tunnel6.c

…

udp_impl.h

udp: make *udp*_queue_rcv_skb() functions static

2017-05-18 10:23:33 -04:00

udp_offload.c

net: avoid skb_warn_bad_offload false positives on UFO

2017-08-08 21:39:01 -07:00

udp.c

net: ipv6: add second dif to inet6 socket lookups

2017-08-07 11:39:22 -07:00

udplite.c

udplite: call proper backlog handlers

2016-11-24 15:32:14 -05:00

xfrm6_input.c

xfrm6: Fix IPv6 payload_len in xfrm6_transport_finish

2017-06-22 10:49:14 +02:00

xfrm6_mode_beet.c

networking: make skb_pull & friends return void pointers

2017-06-16 11:48:39 -04:00

xfrm6_mode_ro.c

ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()

2017-06-02 13:57:27 -04:00

xfrm6_mode_transport.c

ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()

2017-06-02 13:57:27 -04:00

xfrm6_mode_tunnel.c

xfrm: Add encapsulation header offsets while SKB is not encrypted

2017-04-14 10:07:39 +02:00

xfrm6_output.c

xfrm: Add an IPsec hardware offloading API

2017-04-14 10:06:10 +02:00

xfrm6_policy.c

xfrm: remove flow cache

2017-07-18 11:13:41 -07:00

xfrm6_protocol.c

xfrm: input: constify xfrm_input_afinfo

2017-02-09 10:22:17 +01:00

xfrm6_state.c

…

xfrm6_tunnel.c

net, ipv6: convert xfrm6_tunnel_spi.refcnt from atomic_t to refcount_t

2017-07-04 01:29:04 -07:00