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

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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

2015-12-17 22:08:28 -05:00

..

datagram.c

net: Fix inverted test in __skb_recv_datagram

2015-12-08 11:30:17 -05:00

dev_addr_lists.c

…

dev_ioctl.c

…

dev.c

net: Add driver helper functions to determine checksum offloadability

2015-12-15 16:50:21 -05:00

drop_monitor.c

…

dst.c

net: fix a race in dst_release()

2015-11-09 21:55:48 -05:00

ethtool.c

net: Rename NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK

2015-12-15 16:50:08 -05:00

fib_rules.c

fib_rules: fix fib rule dumps across multiple skbs

2015-09-24 15:21:54 -07:00

filter.c

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

2015-10-20 06:08:27 -07:00

flow_dissector.c

flow_dissector: Use 'const' where possible.

2015-09-01 21:19:17 -07:00

flow.c

flow: Move __get_hash_from_flowi{4,6} into flow_dissector.c

2015-09-01 17:00:24 -07:00

gen_estimator.c

net_sched: gen_estimator: extend pps limit

2015-07-08 13:59:20 -07:00

gen_stats.c

…

link_watch.c

…

lwtunnel.c

dst: Pass net into dst->output

2015-10-08 04:27:03 -07:00

Makefile

lwtunnel: infrastructure for handling light weight tunnels like mpls

2015-07-21 10:39:03 -07:00

neighbour.c

net/neighbour: fix crash at dumping device-agnostic proxy entries

2015-12-03 00:07:51 -05:00

net_namespace.c

netns: make nsid_lock per net

2015-05-17 23:41:11 -04:00

net-procfs.c

…

net-sysfs.c

switchdev: Pass original device to port netdev driver

2015-12-15 11:58:20 -05:00

net-sysfs.h

…

net-traces.c

net: IPv6 fib lookup tracepoint

2015-11-22 11:54:10 -05:00

netclassid_cgroup.c

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

2015-12-17 22:08:28 -05:00

netevent.c

netevent: remove automatic variable in register_netevent_notifier()

2015-05-31 00:03:21 -07:00

netpoll.c

netpoll: Drop budget parameter from NAPI polling call hierarchy

2015-09-29 14:57:16 -07:00

netprio_cgroup.c

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

2015-12-17 22:08:28 -05:00

pktgen.c

net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM

2015-12-15 16:50:20 -05:00

ptp_classifier.c

ptp: Change ptp_class to a proper bitmask

2015-11-03 11:08:22 -05:00

request_sock.c

tcp: restore fastopen operations

2015-10-05 03:19:06 -07:00

rtnetlink.c

net: Pass ndm_state to route netlink FDB notifications.

2015-12-16 18:36:46 -05:00

scm.c

net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct

2015-12-08 22:02:33 -05:00

secure_seq.c

net: remove a sparse error in secure_dccpv6_sequence_number()

2015-05-25 22:55:37 -04:00

skbuff.c

net: check both type and procotol for tcp sockets

2015-12-17 15:46:32 -05:00

sock_diag.c

net: diag: Add the ability to destroy a socket.

2015-12-15 23:26:51 -05:00

sock.c

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

2015-12-17 22:08:28 -05:00

stream.c

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

2015-12-03 21:09:12 -05:00

sysctl_net_core.c

…

timestamping.c

net: skb_defer_rx_timestamp should check for phydev before setting up classify

2015-07-09 14:17:15 -07:00

tso.c

net: tso: add support for IPv6

2015-10-26 22:24:22 -07:00

utils.c

net: move net_get_random_once to lib

2015-10-08 05:26:35 -07:00