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

Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

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

2018-04-01 19:49:34 -04:00

..

datagram.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

dev_addr_lists.c

net: fix spelling for synchronized

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

dev_ioctl.c

net: don't unnecessarily load kernel modules in dev_ioctl()

2018-03-07 15:12:58 -05:00

dev.c

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

2018-04-01 19:49:34 -04:00

devlink.c

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

2018-03-23 11:31:58 -04:00

drop_monitor.c

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

dst_cache.c

net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency

2018-03-05 12:52:45 -05:00

dst.c

net: Remove dst->next

2017-11-30 09:54:27 -05:00

ethtool.c

ethtool: enable Inline TLS in HW

2018-03-31 23:37:32 -04:00

fib_notifier.c

net: Fix fib notifer to return errno

2018-03-29 14:10:30 -04:00

fib_rules.c

net: Move call_fib_rule_notifiers up in fib_nl_newrule

2018-03-29 14:10:30 -04:00

filter.c

bpf: Post-hooks for sys_bind

2018-03-31 02:16:26 +02:00

flow_dissector.c

net: Remove unused get_hash_from_flow functions

2018-03-04 13:04:23 -05:00

gen_estimator.c

net_sched: gen_estimator: fix broken estimators based on percpu stats

2018-02-23 12:35:46 -05:00

gen_stats.c

net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mq

2017-12-08 13:32:26 -05:00

gro_cells.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

hwbm.c

net: hwbm: Fix unbalanced spinlock in error case

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

link_watch.c

net: link_watch: mark bonding link events urgent

2018-01-23 19:43:30 -05:00

lwt_bpf.c

bpf: rename bpf_compute_data_end into bpf_compute_data_pointers

2017-09-26 13:36:44 -07:00

lwtunnel.c

ipv6: sr: define core operations for seg6local lightweight tunnel

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

Makefile

xdp: base API for new XDP rx-queue info concept

2018-01-05 15:21:20 -08:00

neighbour.c

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

2018-01-17 00:10:42 -05:00

net_namespace.c

net: Do not take net_rwsem in __rtnl_link_unregister()

2018-03-31 22:24:58 -04:00

net-procfs.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

net-sysfs.c

net: Use octal not symbolic permissions

2018-03-26 12:07:48 -04:00

net-sysfs.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

net-traces.c

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

2017-11-04 09:26:51 +09:00

netclassid_cgroup.c

cgroup: add @flags to css_task_iter_start() and implement CSS_TASK_ITER_PROCS

2017-07-21 11:14:51 -04:00

netevent.c

netevent: remove automatic variable in register_netevent_notifier()

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

netpoll.c

netpoll: Use lockdep to assert IRQs are disabled/enabled

2017-11-08 11:13:54 +01:00

netprio_cgroup.c

net: remove duplicate includes

2017-12-13 13:18:46 -05:00

pktgen.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04: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

net: Do not take net_rwsem in __rtnl_link_unregister()

2018-03-31 22:24:58 -04: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: Namespaceify sysctl_tcp_timestamps

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

skbuff.c

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

2018-04-01 19:49:34 -04:00

sock_diag.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

sock_reuseport.c

soreuseport: fix mem leak in reuseport_add_sock()

2018-02-02 19:47:03 -05:00

sock.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

stream.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

sysctl_net_core.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04: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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

utils.c

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

2017-05-02 16:40:27 -07:00

xdp.c

xdp/qede: setup xdp_rxq_info and intro xdp_rxq_info_is_reg

2018-01-05 15:21:21 -08:00