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

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmgenet.c
	net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

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

2017-03-15 11:59:10 -07:00

..

datagram.c

udp: properly cope with csum errors

2017-02-07 11:19:00 -05:00

dev_addr_lists.c

net: fix spelling for synchronized

2014-11-18 15:26:32 -05:00

dev_ioctl.c

dev_ioctl: use sizeof(x) instead of sizeof x

2014-11-18 15:27:32 -05:00

dev.c

net: Resend IGMP memberships upon peer notification.

2017-03-14 11:33:44 -07:00

devlink.c

devlink: allow to fillup eswitch attrs even if mode_get op does not exist

2017-02-10 14:43:00 -05:00

drop_monitor.c

drop_monitor: use setup_timer

2017-03-12 23:47:16 -07:00

dst_cache.c

net: dst_cache_per_cpu_dst_set() can be static

2016-03-18 17:45:08 -04:00

dst.c

net: pending_confirm is not used anymore

2017-02-07 13:07:47 -05:00

ethtool.c

ethtool: add CRC32 as an RSS hash function

2017-03-09 16:39:58 -08:00

fib_rules.c

net: core: add missing check for uid_range in rule_exists.

2016-11-09 13:28:10 -05:00

filter.c

bpf: Fix bpf_xdp_event_output

2017-02-23 13:53:42 -05:00

flow_dissector.c

flow_dissector: Move GRE dissection into a separate function

2017-03-08 23:08:57 -08:00

flow.c

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2016-12-12 19:25:04 -08:00

gen_estimator.c

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

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

gen_stats.c

net_sched: gen_estimator: complete rewrite of rate estimators

2016-12-05 15:21:59 -05:00

gro_cells.c

gro_cells: move to net/core/gro_cells.c

2017-02-08 14:38:18 -05:00

hwbm.c

net: hwbm: Fix unbalanced spinlock in error case

2016-05-25 12:35:09 -07:00

link_watch.c

dev: introduce dev_get_iflink()

2015-04-02 14:04:59 -04:00

lwt_bpf.c

lwtunnel: remove device arg to lwtunnel_build_state

2017-01-30 15:14:22 -05:00

lwtunnel.c

lwtunnel: remove unused but set variable

2017-03-13 23:55:45 -07:00

Makefile

gro_cells: move to net/core/gro_cells.c

2017-02-08 14:38:18 -05:00

neighbour.c

net: neigh: Fix netevent NETEVENT_DELAY_PROBE_TIME_UPDATE notification

2017-02-15 12:38:43 -05:00

net_namespace.c

sched/headers: Prepare to move the task_lock()/unlock() APIs to <linux/sched/task.h>

2017-03-02 08:42:38 +01:00

net-procfs.c

net: remove NETDEV_TX_LOCKED support

2016-04-26 15:53:05 -04:00

net-sysfs.c

net: use net->count to check whether a netns is alive or not

2017-03-13 16:02:27 -07:00

net-sysfs.h

net: netdev_kobject_init: annotate with __init

2014-01-05 20:27:54 -05:00

net-traces.c

net: IPv6 fib lookup tracepoint

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

netclassid_cgroup.c

sched/headers: Prepare to move the task_lock()/unlock() APIs to <linux/sched/task.h>

2017-03-02 08:42:38 +01:00

netevent.c

netevent: remove automatic variable in register_netevent_notifier()

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

netpoll.c

netpoll: more efficient locking

2016-11-16 18:32:02 -05:00

netprio_cgroup.c

sched/headers: Prepare to move the task_lock()/unlock() APIs to <linux/sched/task.h>

2017-03-02 08:42:38 +01:00

pktgen.c

net-tc: convert tc_verd to integer bitfields

2017-01-08 20:58:52 -05:00

ptp_classifier.c

ptp: Change ptp_class to a proper bitmask

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

request_sock.c

ipv4: Namespaceify tcp_max_syn_backlog knob

2016-12-29 11:38:31 -05:00

rtnetlink.c

rtnl: simplify error return path in rtnl_create_link()

2017-02-21 12:17:43 -05:00

scm.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/user.h>

2017-03-02 08:42:29 +01:00

secure_seq.c

tcp: rename *_sequence_number() to *_seq_and_tsoff()

2017-03-09 18:25:34 -08:00

skbuff.c

net: fix socket refcounting in skb_complete_tx_timestamp()

2017-03-07 14:06:15 -08:00

sock_diag.c

sock_diag: align nlattr properly when needed

2016-04-26 12:00:48 -04:00

sock_reuseport.c

soreuseport: do not export reuseport_add_sock()

2016-10-18 14:18:23 -04:00

sock.c

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

2017-03-15 11:59:10 -07:00

stream.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

sysctl_net_core.c

bpf: make jited programs visible in traces

2017-02-17 13:40:05 -05:00

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

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

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