David S. Miller
4cc1feeb6f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Several conflicts, seemingly all over the place.
I used Stephen Rothwell's sample resolutions for many of these, if not
just to double check my own work, so definitely the credit largely
goes to him.
The NFP conflict consisted of a bug fix (moving operations
past the rhashtable operation) while chaning the initial
argument in the function call in the moved code.
The net/dsa/master.c conflict had to do with a bug fix intermixing of
making dsa_master_set_mtu() static with the fixing of the tagging
attribute location.
cls_flower had a conflict because the dup reject fix from Or
overlapped with the addition of port range classifiction.
__set_phy_supported()'s conflict was relatively easy to resolve
because Andrew fixed it in both trees, so it was just a matter
of taking the net-next copy. Or at least I think it was :-)
Joe Stringer's fix to the handling of netns id 0 in bpf_sk_lookup()
intermixed with changes on how the sdif and caller_net are calculated
in these code paths in net-next.
The remaining BPF conflicts were largely about the addition of the
__bpf_md_ptr stuff in 'net' overlapping with adjustments and additions
to the relevant data structure where the MD pointer macros are used.
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-09 21:43:31 -08:00
9p: Add refcount to p9_req_t
2018-09-08 01:39:47 +09:00
Bluetooth: Errata Service Release 8, Erratum 3253
2018-10-14 10:25:47 +02:00
net/af_iucv: locate IUCV header via skb_network_header()
2018-09-26 09:56:07 -07:00
netfilter: add missing error handling code for register functions
2018-11-27 00:35:19 +01:00
net: provide a sysctl raw_l3mdev_accept for raw socket lookup with VRFs
2018-11-07 16:12:38 -08:00
NFC: Fix the number of pipes
2018-09-18 19:55:01 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-12-09 21:43:31 -08:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
2018-07-20 21:17:12 -07:00
net_sched: convert idrinfo->lock from spinlock to a mutex
2018-10-05 00:36:31 -07:00
net/ipv6: Add anycast addresses to a global hashtable
2018-11-02 23:54:56 -07:00
ieee802154: add rx LQI from userspace
2018-07-13 12:18:18 -04:00
rxrpc: Fix life check
2018-11-15 11:35:40 -08:00
net: drop a space before tabs
2018-10-31 12:37:12 -07:00
vsock: split dwork to avoid reinitializations
2018-08-07 12:39:13 -07:00
include/net/bond_3ad: Simplify the code by using the ARRAY_SIZE
2018-08-04 13:23:15 -07:00
bonding: avoid possible dead-lock
2018-09-26 20:22:19 -07:00
net: remove sock_poll_busy_flag
2018-07-30 09:10:25 -07:00
nl80211: Add per peer statistics to compute FCS error rate
2018-10-12 12:56:34 +02:00
net: dcb: Add priority-to-DSCP map getters
2018-07-27 13:17:50 -07:00
devlink: Add 'fw_load_policy' generic parameter
2018-12-03 13:55:43 -08:00
net: dsa: Add overhead to tag protocol ops.
2018-12-06 12:18:16 -08:00
geneve, vxlan: Don't set exceptions if skb->len < mtu
2018-10-17 21:51:13 -07:00
erspan: set bso bit based on mirrored packet's len
2018-05-20 18:31:42 -04:00
net: Introduce generic failover module
2018-05-28 22:59:54 -04:00
net: reorder flowi_common fields to avoid holes
2018-11-30 17:12:39 -08:00
net/flow_dissector: correct comments on enum flow_dissector_key_id
2018-11-30 13:21:52 -08:00
net: align gnet_stats_basic_cpu struct
2018-11-17 21:37:29 -08:00
genetlink: constify genl_err_attr() argument
2018-08-29 19:42:52 -07:00
net: add netif_is_geneve()
2018-11-07 23:00:23 -08:00
net: Convert protocol error handlers from void to int
2018-11-08 17:13:08 -08:00
mac80211: support reporting 0-length PSDU in radiotap
2018-09-05 10:08:25 +02:00
net/ipv6: Add anycast addresses to a global hashtable
2018-11-02 23:54:56 -07:00
net: allow binding socket in a VRF when there's an unbound socket
2018-11-07 16:12:38 -08:00
net: Convert GRO SKB handling to list_head.
2018-06-26 11:33:04 +09:00
inet/connection_sock: prefer _THIS_IP_ to current_text_addr
2018-08-14 10:04:36 -07:00
inet: Refactor INET_ECN_decapsulate()
2018-10-17 17:45:07 -07:00
ip: add helpers to process in-order fragments faster.
2018-08-11 17:54:18 -07:00
net: ensure unbound stream socket to be chosen when not in a VRF
2018-11-07 16:12:38 -08:00
net: ensure unbound stream socket to be chosen when not in a VRF
2018-11-07 16:12:38 -08:00
net-tcp: remove useless tw_timeout field
2018-06-05 10:45:24 -04:00
ip: factor out protocol delivery helper
2018-11-07 16:23:05 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-10-19 11:03:06 -07:00
net: Add struct for fib dump filter
2018-10-16 00:13:12 -07:00
udp: Support for error handlers of tunnels with arbitrary destination port
2018-11-08 17:13:08 -08:00
net: Don't return invalid table id error when dumping all families
2018-10-24 14:06:25 -07:00
udp: Support for error handlers of tunnels with arbitrary destination port
2018-11-08 17:13:08 -08:00
ipvs: add assured state for conn templates
2018-07-18 11:26:40 +02:00
ipv6: factor out protocol delivery helper
2018-11-07 16:23:05 -08:00
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module
2018-07-18 11:26:53 +02:00
l3mdev: add function to retreive upper master
2018-12-03 14:15:26 -08:00
net: Add lag.h, net_lag_port_dev_txable()
2018-07-11 23:10:19 -07:00
llc: avoid blocking in llc_sap_close()
2018-09-13 09:04:58 -07:00
mac80211: implement ieee80211_tx_rate_update to update rate
2018-10-12 13:05:40 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-12-09 21:43:31 -08:00
net: Introduce net_failover driver
2018-05-28 22:59:54 -04:00
flow_dissector: implements flow dissector BPF hook
2018-09-14 12:04:33 -07:00
net: ipv4: Notify about changes to ip_forward_update_priority
2018-08-01 09:52:30 -07:00
netlink: replace __NLA_ENSURE implementation
2018-10-12 11:00:22 -07:00
xdp: introduce xdp_return_frame_rx_napi
2018-05-24 18:36:15 -07:00
net: sched: cls_u32: add res to offload information
2018-11-19 18:53:46 -08:00
net: sched: extend Qdisc with rcu
2018-09-25 20:17:35 -07:00
net: Convert protocol error handlers from void to int
2018-11-08 17:13:08 -08:00
net: fix raw socket lookup device bind matching with VRFs
2018-11-07 16:12:39 -08:00
cfg80211: make wmm_rule part of the reg_rule structure
2018-08-28 11:11:47 +02:00
net-ipv4: remove 2 always zero parameters from ipv4_redirect()
2018-09-26 20:30:55 -07:00
net: Add extack argument to rtnl_create_link
2018-11-06 15:00:45 -08:00
net: sched: register callbacks for indirect tc block binds
2018-11-11 09:54:52 -08:00
pids: Compute task_tgid using signal->leader_pid
2018-07-21 10:43:12 -05:00
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
bpf: add End.DT6 action to bpf_lwt_seg6_action helper
2018-07-31 09:22:48 +02:00
net/smc: add pnetid support for SMC-D and ISM
2018-06-30 20:42:25 +09:00
tcp: reduce POLLOUT events caused by TCP_NOTSENT_LOWAT
2018-12-04 21:21:18 -08:00
bpf: Enable BPF_PROG_TYPE_SK_REUSEPORT bpf prog in reuseport selection
2018-08-11 01:58:46 +02:00
strparser: Add __strp_unpause and use it in ktls.
2018-06-06 14:07:53 -04:00
switchdev: Replace port obj add/del SDO with a notification
2018-11-23 18:02:24 -08:00
tcp: reduce POLLOUT events caused by TCP_NOTSENT_LOWAT
2018-12-04 21:21:18 -08:00
tls: replace poll implementation with read hook
2018-10-15 12:23:19 -07:00
ipv6: fold sockcm_cookie into ipcm6_cookie
2018-07-07 10:58:49 +09:00
net: Convert protocol error handlers from void to int
2018-11-08 17:13:08 -08:00
udp_tunnel: add config option to bind to a device
2018-12-03 14:15:26 -08:00
vxlan: Add vxlan_fdb_clear_offload()
2018-12-07 12:59:08 -08:00
xdp: export xdp_rxq_info_unreg_mem_model
2018-08-29 12:25:53 -07:00
ethtool: don't allow disabling queues with umem installed
2018-10-05 09:31:01 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2018-08-15 15:04:25 -07:00
4cc1feeb6f