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

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

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

..

ila

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

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

netfilter

sk_buff: remove support for csum_bad in sk_buff

2017-05-19 19:21:29 -04: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

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

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

addrlabel.c

net: rtnetlink: plumb extended ack to doit function

2017-04-17 15:35:38 -04:00

af_inet6.c

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

2017-04-26 22:39:08 -04:00

ah6.c

ipsec: check return value of skb_to_sgvec always

2017-06-04 23:01:47 -04:00

anycast.c

ipv6: coding style: comparison for equality with NULL

2015-03-31 13:51:54 -04:00

calipso.c

net/ipv6: Fix CALIPSO causing GPF with datagram support

2017-06-06 15:18:20 -04:00

datagram.c

net-timestamp: avoid use-after-free in ip_recv_error

2017-04-17 12:59:22 -04:00

esp6_offload.c

esp4/6: Fix GSO path for non-GSO SW-crypto packets

2017-04-19 07:48:57 +02:00

esp6.c

ipsec: check return value of skb_to_sgvec always

2017-06-04 23:01:47 -04:00

exthdrs_core.c

ipv6: constify the skb pointer of ipv6_find_tlv().

2016-06-27 15:06:15 -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: Need to export ipv6_push_frag_opts for tunneling now.

2017-05-01 15:10:20 -04:00

fib6_rules.c

net: flow: Add l3mdev flow update

2016-09-10 23:12:51 -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

inet: collapse ipv4/v6 rcv_saddr_equal functions into one

2017-01-18 13:04:28 -05:00

ip6_checksum.c

ipv6: fix checksum annotation in udp6_csum_init

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

ip6_fib.c

net: ipv6: Add extack messages for route add failures

2017-05-22 12:12:20 -04:00

ip6_flowlabel.c

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

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

ip6_gre.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -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

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

udp: Add GRO functions to UDP socket

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

ip6_output.c

Remove the redundant skb->dev initialization in ip6_fragment

2017-06-10 16:25:21 -04:00

ip6_tunnel.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -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

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

ip6mr.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

ipcomp6.c

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

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

ipv6_sockglue.c

net: Allow IP_MULTICAST_IF to set index to L3 slave

2016-12-30 15:24:47 -05:00

Kconfig

ipv6: sr: select DST_CACHE by default

2017-03-27 16:05:06 -07:00

Makefile

esp: Add a software GRO codepath

2017-02-15 11:04:11 +01: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

ipv6: add support for NETDEV_RESEND_IGMP event

2017-03-28 22:02:21 -07:00

mip6.c

ktime: Get rid of ktime_equal()

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

ndisc.c

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

2017-04-26 22:39:08 -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: Prevent overrun when parsing v6 header options

2017-05-17 14:55:59 -04: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: ping: do not abuse udp_poll()

2017-06-04 22:56:55 -04: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-06-15 11:59:32 -04: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

net: add extack arg to lwtunnel build state

2017-05-30 11:55:32 -04:00

seg6.c

ipv6: drop unused variables in seg6_genl_dumphac

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

sit.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

syncookies.c

tcp: Namespaceify sysctl_tcp_timestamps

2017-06-08 10:53:29 -04:00

sysctl_net_ipv6.c

calipso: Add a label cache.

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

tcp_ipv6.c

bpf: Remove duplicate tcp_filter hook in ipv6

2017-06-10 16:08:02 -04: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

udp: make *udp*_queue_rcv_skb() functions static

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

udp_offload.c

ipv6: Check ip6_find_1stfragopt() return value properly.

2017-05-17 22:54:11 -04:00

udp.c

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

2017-05-18 16:11:32 -04:00

udplite.c

udplite: call proper backlog handlers

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

xfrm6_input.c

esp: Add a software GRO codepath

2017-02-15 11:04:11 +01:00

xfrm6_mode_beet.c

xfrm: simplify xfrm_address_t use

2015-03-31 13:58:35 -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: policy: make policy backend const

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

xfrm6_protocol.c

xfrm: input: constify xfrm_input_afinfo

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

xfrm6_state.c

ipv6: White-space cleansing : Line Layouts

2014-08-24 22:37:52 -07:00

xfrm6_tunnel.c

netns: make struct pernet_operations::id unsigned int

2016-11-18 10:59:15 -05:00