I did a test merge with your tree and there are three conflicts to resolve:
1) net/ipv4/tcp
This is overlapping stuff with the CONFIG_NET_DMA removal. Keep the
net-next conflict hunks but kill the third boolean argument to
sk_eat_skb().
2) Documentation/networking/timestamping/Makefile
net-next adds a leading comment to this file, and adds a new
target to hostprogs-y. Preserve all of this, and do that the
change in your tree did, which is make the list of targets
in hostprogs-y alphabetical.
Your side removes the obj- := dummy.o thing, as well as the
clean target, and those should be preserved as well.
3) include/linux/skbuff.h
More overlapping stuff with the CONFIG_NET_DMA removal.
Preserve net-next hunks, and then change the:
#if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL
union {
unsigned int napi_id;
dma_cookie_t dma_cookie;
};
#endif
into:
#ifdef CONFIG_NET_RX_BUSY_POLL
unsigned int napi_id;
#endif
Most notable changes in here:
1) By far the biggest accomplishment, thanks to a large range of contributors,
is the addition of multi-send for transmit. This is the result of discussions
back in Chicago, and the hard work of several individuals.
Now, when the ->ndo_start_xmit() method of a driver sees skb->xmit_more as
true, it can choose to defer the doorbell telling the driver to start
processing the new TX queue entires.
skb->xmit_more means that the generic networking is guaranteed to call the
driver immediately with another SKB to send.
There is logic added to the qdisc layer to dequeue multiple packets
at a time, and the handling mis-predicted offloads in software is
now done with no locks held.
Finally, pktgen is extended to have a "burst" parameter that can be used to
test a multi-send implementation.
Several drivers have xmit_more support: i40e, igb, ixgbe, mlx4, virtio_net
Adding support is almost trivial, so export more drivers to support this
optimization soon.
I want to thank, in no particular or implied order, Jesper Dangaard
Brouer, Eric Dumazet, Alexander Duyck, Tom Herbert, Jamal Hadi
Salim, John Fastabend, Florian Westphal, Daniel Borkmann, David
Tat, Hannes Frederic Sowa, and Rusty Russell.
2) PTP and timestamping support in bnx2x, from Michal Kalderon.
3) Allow adjusting the rx_copybreak threshold for a driver via
ethtool, and add rx_copybreak support to enic driver. From
Govindarajulu Varadarajan.
4) Significant enhancements to the generic PHY layer and the
bcm7xxx driver in particular (EEE support, auto power down,
etc.) from Florian Fainelli.
5) Allow raw buffers to be used for flow dissection, allowing drivers
to determine the optimal "linear pull" size for devices that
DMA into pools of pages. The objective is to get exactly the
necessary amount of headers into the linear SKB area pre-pulled,
but no more. The new interface drivers use is eth_get_headlen().
From WANG Cong, with driver conversions (several had their own
by-hand duplicated implementations) by Alexander Duyck and
Eric Dumazet.
6) Support checksumming more smoothly and efficiently for encapsulations,
and add "foo over UDP" facility. From Tom Herbert.
7) Add Broadcom SF2 switch driver to DSA layer, from Florian Fainelli.
8) eBPF now can load programs via a system call and has an extensive
testsuite. Alexei Starovoitov and Daniel Borkmann.
9) Major overhaul of the packet scheduler to use RCU in several major
areas such as the classifiers and rate estimators. From John
Fastabend.
10) Add driver for Intel FM10000 Ethernet Switch, from Alexander Duyck.
11) Rearrange TCP_SKB_CB() to reduce cache line misses, from Eric
Dumazet.
12) Add Datacenter TCP congestion control algorithm support, From
Florian Westphal.
13) Reorganize sk_buff so that __copy_skb_header() is significantly
faster. From Eric Dumazet.
Please pull, thanks a lot!
The following changes since commit ee042ec88022249b848306dd6e87ffd2fd88a839:
Merge tag 'md/3.17-final-fix' of git://neil.brown.name/md (2014-10-03 08:40:37 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git master
for you to fetch changes up to 64b1f00a0830e1c53874067273a096b228d83d36:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2014-10-08 16:22:22 -0400)
----------------------------------------------------------------
Ajit Khaparde (1):
be2net: fix RX fragment posting for jumbo frames
Alex Gartrell (10):
ipvs: Add destination address family to netlink interface
ipvs: Supply destination addr family to ip_vs_{lookup_dest,find_dest}
ipvs: Pass destination address family to ip_vs_trash_get_dest
ipvs: Supply destination address family to ip_vs_conn_new
ipvs: prevent mixing heterogeneous pools and synchronization
ipvs: Pull out crosses_local_route_boundary logic
ipvs: Pull out update_pmtu code
ipvs: Add generic ensure_mtu_is_adequate to handle mixed pools
ipvs: support ipv4 in ipv6 and ipv6 in ipv4 tunnel forwarding
ipvs: Allow heterogeneous pools now that we support them
Alexander Aring (1):
ieee802154: 6lowpan: remove unused function
Alexander Bondar (1):
iwlwifi: mvm: Allow schedule scan while connected
Alexander Duyck (47):
ixgbe: Cleanup FDB handling code
net-timestamp: Merge shared code between phy and regular timestamping
net-timestamp: Make the clone operation stand-alone from phy timestamping
net: merge cases where sock_efree and sock_edemux are the same function
net: Add function for parsing the header length out of linear ethernet frames
igb: use new eth_get_headlen interface
ixgbe: use new eth_get_headlen interface
dp83640: Make use of skb_queue_purge instead of reimplementing the code
ixgbe: Drop Rx alloc at end of Rx cleanup
ixgbe: Refactor busy poll socket code to address multiple issues
skb: Add documentation for skb_clone_sk
mac80211: Resolve sk_refcnt/sk_wmem_alloc issue in wifi ack path
netdevice: Support DSA tagging when DSA is built as a module
dsa: Split ops up, and avoid assigning tag_protocol and receive separately
dsa: Replace mii_bus with a generic host device
fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver
fm10k: Add register defines and basic structures
fm10k: Add support for TLV message parsing and generation
fm10k: Add support for basic interaction with hardware
fm10k: Add support for mailbox
fm10k: Implement PF <-> SM mailbox operations
fm10k: Add support for PF
fm10k: Add support for configuring PF interface
fm10k: Add netdev
fm10k: Add support for L2 filtering
fm10k: Add support for ndo_open/stop
fm10k: Add interrupt support
fm10k: add support for Tx/Rx rings
fm10k: Add service task to handle delayed events
fm10k: Add Tx/Rx hardware ring bring-up/tear-down
fm10k: Add transmit and receive fastpath and interrupt handlers
fm10k: Add ethtool support
fm10k: Add support for PCI power management and error handling
fm10k: Add support for multiple queues
fm10k: Add support for netdev offloads
fm10k: Add support for MACVLAN acceleration
fm10k: Add support for PF <-> VF mailbox
fm10k: Add support for VF
fm10k: Add support for SR-IOV to PF core files
fm10k: Add support for SR-IOV to driver
fm10k: Add support for IEEE DCBx
fm10k: Add support for debugfs
fm10k: Add support for ptp to hw specific files
fm10k: Add support for PTP
fm10k: Reduce buffer size when pages are larger than 4K
fm10k: Correctly set the number of Tx queues
Update Intel Ethernet Driver maintainers list
Alexei Starovoitov (20):
bpf: x86: add missing 'shift by register' instructions to x64 eBPF JIT
net: filter: add "load 64-bit immediate" eBPF instruction
net: filter: split filter.h and expose eBPF to user space
sparc: bpf_jit: add SKF_AD_PKTTYPE support to JIT
net: bpf: fix compiler warnings in test_bpf
bpf: introduce BPF syscall and maps
bpf: enable bpf syscall on x64 and i386
bpf: add lookup/update/delete/iterate methods to BPF maps
bpf: expand BPF syscall with program load/unload
bpf: handle pseudo BPF_CALL insn
bpf: verifier (add docs)
bpf: verifier (add ability to receive verification log)
bpf: handle pseudo BPF_LD_IMM64 insn
bpf: verifier (add branch/goto checks)
bpf: verifier (add verifier core)
bpf: mini eBPF library, test stubs and verifier testsuite
sparc: bpf_jit: add support for BPF_LD(X) | BPF_LEN instructions
bpf: add search pruning optimization to verifier
bpf: add tests to verifier testsuite
net: pktgen: packet bursting via skb->xmit_more
Alexey Perevalov (1):
netfilter: nfnetlink_acct: add filter support to nfacct counter list/reset
Amir Vadai (3):
crash_dump: Make is_kdump_kernel() accessible from modules
net/mlx4: Use is_kdump_kernel() to detect kdump kernel
net/bnx2x: Use is_kdump_kernel() to detect kdump kernel
Amitkumar Karwar (11):
mwifiex: fix left_len calculation issue
mwifiex: rename macro and variables related to API revision
mwifiex: use firmware API revision from GET_HW_SPEC response
mwifiex: fix a bug in Tx multiport aggregation
mwifiex: minor cleanup in multiport aggregation
mwifiex: remove redundant variable report_scan_result
mwifiex: remove low priority scan handling
Bluetooth: btmrvl: rename definitions from 88xx to 8897
Bluetooth: btusb: remove redundant lock variable
mwifiex: error path handling in pcie firmware dump
mwifiex: add more dump information for PCIe interface
Ana Rey (3):
netfilter: nft_meta: add pkttype support
netfilter: nft_meta: Add cpu attribute support
netfilter: nf_tables: add devgroup support in meta expresion
Andreea-Cristina Bernat (9):
cnic: Replace rcu_dereference() with rcu_access_pointer()
bonding: Replace rcu_dereference() with rcu_access_pointer()
net/ipv4/igmp.c: Replace rcu_dereference() with rcu_access_pointer()
net/openvswitch/flow.c: Replace rcu_dereference() with rcu_access_pointer()
br_multicast: Replace rcu_assign_pointer() with RCU_INIT_POINTER()
mac80211: scan: Replace rcu_assign_pointer() with RCU_INIT_POINTER()
mac80211: Replace rcu_dereference() with rcu_access_pointer()
carl9170: Remove redundant protection check
carl9170: tx: Replace rcu_assign_pointer() with RCU_INIT_POINTER()
Andrei Otcheretianski (4):
ieee80211: Support parsing TPC report element in action frames
iwlwifi: mvm: Update TX power in TPC reports
iwlwifi: mvm: Set RRM_ENABLED bit in scan commands
iwlwifi: mvm: Refactor and fix max probe len computation
Andrew Lunn (1):
net: DSA: Marvell mv88e6171 switch driver
Andy Gospodarek (1):
bonding: make global bonding stats more reliable
Andy Shevchenko (3):
rose: use %*ph specifier
irda: vlsi_ir: use %*ph specifier
hostap: proc: substitute loops by %*phN
Andy Zhou (13):
l2tp: fix missing line continuation
openvswitch: simplify sample action implementation
openvswitch: Add recirc and hash action.
udp_tunnel: Seperate ipv6 functions into its own file.
udp-tunnel: Add a few more UDP tunnel APIs
vxlan: Refactor vxlan driver to make use of the common UDP tunnel functions.
l2tp: Refactor l2tp core driver to make use of the common UDP tunnel functions
udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected
vxlan: Fix bug introduced by commit acbf74a76300
net: Add Geneve tunneling protocol driver
net: fix a sparse warning
openvswitch: fix a sparse warning
openvswitch: fix a compilation error when CONFIG_INET is not setW!
Anjali Singhai Jain (5):
i40e: Some FD message fixes
i40e: ATR policy change to flush the table to clean stale ATR rules
i40e: Add a FD flush counter to ethtool
i40e/i40evf: Ignore a driver perceived Tx hang if the number of desc pending < 4
i40e: Fix an issue when PF reset fails
Antoine Ténart (13):
net: pxa168_eth: clean up
net: pxa168_eth: add device tree support
Documentation: bindings: net: add the Marvell PXA168 Ethernet controller
net: pxa168_eth: fix Ethernet flow control status
net: pxa168_eth: set the mac address on the Ethernet controller
net: pxa168_eth: rework the MAC address setup
net: pxa168_eth: allow Berlin SoCs to use the pxa168_eth driver
net: pxa168_eth: allow to compile the pxa168_eth driver for tests
ARM: dts: berlin: add the Ethernet node
ARM: dts: berlin: enable the Ethernet port on the BG2Q DMP
net: spider_net: do not read mac address again after setting it
net: spider_net: avoid using signed char for bitops
net: pxa168_eth: avoid using signed char for bitops
Anton Danilov (5):
netfilter: ipset: Add skbinfo extension kernel support in the ipset core.
netfilter: ipset: Add skbinfo extension kernel support for the bitmap set types.
netfilter: ipset: Add skbinfo extension kernel support for the hash set types.
netfilter: ipset: Add skbinfo extension kernel support for the list set type.
netfilter: ipset: Add skbinfo extension support to SET target.
Arend van Spriel (1):
brcmfmac: assure P2P discovery is disabled when setting P2P_DEVICE mac address
Ariel Elior (1):
bnx2x: FW assertion changes
Arik Nemtsov (3):
mac80211: set network header in TDLS frames
iwlwifi: mvm: move TDLS code to separate file
iwlwifi: mvm: fix PSM disable during TDLS
Arturo Borrero (11):
netfilter: nf_tables: refactor rule deletion helper
netfilter: nf_tables: add helper to unregister chain hooks
netfilter: nf_tables: rename nf_table_delrule_by_chain()
netfilter: nf_tables: add helpers to schedule objects deletion
netfilter: nf_tables: extend NFT_MSG_DELTABLE to support flushing the ruleset
netfilter: nft_nat: include a flag attribute
netfilter: nf_nat: generalize IPv4 masquerading support for nf_tables
netfilter: nf_nat: generalize IPv6 masquerading support for nf_tables
netfilter: nf_tables: add new nft_masq expression
netfilter: nf_tables: store and dump set policy
netfilter: nft_masq: register/unregister notifiers on module init/exit
Ashish Shah (1):
i40e: set num_queue_pairs to num configured by VF
Assaf Krauss (4):
nl80211: Allow declaring RRM-related features
nl80211: Add flag attribute for RRM connections
mac80211: Add RRM support to assoc request
iwlwifi: mvm: Announce Quiet Period support
Avinash Patil (17):
mwifiex: set fw api info for backword compatibility
mwifiex: fix probable memory corruption while processing TDLS frame
mwifiex: avoid processing RX packets with invalid length
mwifiex: rework internal scan for association
mwifiex: support for event done interrupt
mwifiex: set passive scan type for scan requests with no ssid
mwifiex: bring in scan channel gap feature
mwifiex: remove restriction of single channel scan when connected
mwifiex: process TX even when scan is ongoing
mwifiex: add rx workqueue support
mwifiex: modify TX/RX window sizes for AP interface
mwifiex: ensure user_scan_in not NULL while setting scan channel gap
mwifiex: fix soft lockup during iperf UDP RX
mwifiex: do not decrement rx_pending count twice
mwifiex: remove unnecessary rx_q lock
mwifiex: few more register offset entries for sdio card structure
mwifiex: add support for SD8887 chipset
Avri Altman (5):
iwlwifi: consolidate hw scheduler configuration code
iwlwifi: trans: configure the scheduler enable register
iwlwifi: mvm: remove unused static inline function
iwlwifi: mvm: Fix skip over dtim configuration in d0i3
iwlwifi: mvm: prepare for scheduler config command
Axel Lin (1):
NFC: st21nfca: Convert to use devm_gpio_request_one
Behan Webster (1):
Bluetooth: LLVMLinux: Remove VLAIS from bluetooth/amp.c
Ben Greear (5):
ath10k: improve 'hard' simulate fw crash
ath10k: improve vdev map handling
ath10k: fix typo in error message
ath10k: provide firmware crash info via debugfs
ath10k: support firmware crash-by-assert
Beniamino Galvani (3):
net: phy: mdio-sun4i: don't select REGULATOR
net: stmmac: add Amlogic Meson glue layer
net: stmmac: meson: document device tree bindings
Bernhard Kaindl (1):
igb: remove blocking phy read from inside spinlock
Bernhard Thaler (1):
Bluetooth: Check for SCO type before setting retransmission effort
Bo Shen (1):
net/macb: Add hardware revision information during probe
Bob Copeland (4):
mac80211: mesh_plink: use get_unaligned_le16 instead of memcpy
ath5k: drop useless comparison
ath5k: ensure led name is null terminated
ath5k: remove redundant null check before kfree()
Bojan Prtvar (1):
netfilter: xt_string: Remove unnecessary initialization of struct ts_state
Canek Peláez Valdés (1):
rt2x00: support Ralink 5362.
Carolyn Wyborny (2):
i40e: Update flow director error messages to reduce user confusion
i40e: Add checks and message for Qualified Module info
Catherine Sullivan (5):
i40e/i40evf: Bump i40e & i40evf version
i40e: Add dual speed module support
i40e: Allow user to change link settings if link is down
i40e: Tell OS link is going down when calling set_phy_config
i40e/i40evf: Bump i40e/i40evf versions
Champion Chen (1):
Bluetooth: Fix issue with USB suspend in btusb driver
Chen Gang (5):
drivers/net/can/Kconfig: Let CAN_AT91 depend on HAS_IOMEM
drivers/net/dsa/Kconfig: Let NET_DSA_BCM_SF2 depend on HAS_IOMEM
drivers/net/ethernet/marvell/Kconfig: Let PXA168_ETH depend on HAS_IOMEM
drivers/net/irda/Kconfig: Let SH_IRDA depend on HAS_IOMEM
drivers/net/phy/Kconfig: Let MDIO_BCM_UNIMAC depend on HAS_IOMEM
Christian Riesch (1):
dp83640: Fix length check for event timestamp status messages
Christophe Gouault (2):
xfrm: hash prefixed policies based on preflen thresholds
xfrm: configure policy hash table thresholds by netlink
Christophe Ricard (29):
NFC: st21nfca: Fix sparse: cast to restricted __be32
NFC: st21nfca: Fix scripts/checkpatch.pl warnings "Missing a blank line after declarations"
NFC: st21nfcb: Fix scripts/checkpatch.pl error "code indent should use tabs where possible"
NFC: st21nfcb: Convert to use devm_gpio_request_one
NFC: st21nfcb: Remove double assignment of .owner in struct device_driver
NFC: st21nfcb: Remove useless new line in nfc_err call
NFC: st21nfcb: Remove inappropriate kfree on a previously devm_kzalloc pointer
NFC: st21nfca: Fix logic when setting session_id
NFC: st21nfca: Remove useless new line in nfc_err call
NFC: st21nfca: Change nfcid3 generation
NFC: st21nfca: Remove useless err == 0 condition
NFC: st21nfca: Remove useless IS_ERR(skb) conditions
NFC: st21nfca: Add condition to make sure atr_req->length is valid.
NFC: st21nfcb: Fix logic when running into i2c read retry
NFC: st21nfca: Clean up st21nfca.h macros
NFC: st21nfca: Clean up macros alignment
NFC: st21nfca: fix "WARNING: else is not generally useful after a break or return"
NFC: st21nfcb: Remove useless headers
NFC: st21nfca: Fix few coding style issue
NFC: st21nfca: Fix potential skb leaks in NFC-DEP code
NFC: st21nfca: Fix recursive fault when doing p2p in target mode.
NFC: dts: st21nfcb_i2c: Fix invalid interrupts polarity.
NFC: st21nfcb: Fix improper management of -EREMOTEIO error code.
NFC: st21nfcb: Fix improper ndlc T2 management
NFC: nci: Add support for proprietary RF Protocols
NFC: st21nfcb: Add ISO15693 Reader/Writer support
NFC: st21nfcb: remove error output
NFC: st21nfca: ERR_PTR vs NULL fix
NFC: st21nfca: Fix potential double kfree_skb error
Chun-Hao Lin (12):
r8169:add support for RTL8168H and RTL8107E
r8169:change uppercase number to lowercase number
r8169:add disable/enable RTL8168G pll function
r8169:add disable/enable RTL8411B pll function
r8169:add support more chips to get mac address from backup mac address register
r8169:add more chips to support magic packet v2
r8169:for function "rtl_w1w0_phy" change its name and behavior
r8169:change the name of function"rtl_w1w0_eri"
r8169:change the name of function "r8168dp_check_dash" to "r8168_check_dash"
r8169:modify the behavior of function "rtl8168_oob_notify"
r8169:call "rtl8168_driver_start" "rtl8168_driver_stop" only when hardware dash function is enabled
r8169:add support for RTL8168EP
Colin Ian King (1):
mISDN: remove DSP_NEVER_DEFINED and adjust code identation
Csaba Kiraly (1):
ath9k_htc: advertise support for TDLS
Dan Carpenter (4):
MAINTAINTERS: The NFC list is subscribers-only
hyperv: NULL dereference on error
cxgb4: potential shift wrapping bug
cxgb4: clean up a type issue
Daniel Borkmann (17):
net: use reciprocal_scale() helper
random32: improvements to prandom_bytes
ixgbe: support skb->xmit_more in netdev_ops->ndo_start_xmit()
ixgbe: flush when in xmit_more mode and under descriptor pressure
net: add skb_get_tx_queue() helper
net: bpf: make eBPF interpreter images read-only
dev_ioctl: remove dev_load() CAP_SYS_MODULE message
net: bpf: consolidate JIT binary allocator
net: bpf: arm: address randomize and write protect JIT code
net: bpf: be friendly to kmemcheck
ipv6: mcast: remove dead debugging defines
net: bpf: only build bpf_jit_binary_{alloc, free}() when jit selected
ipv6: mld: answer mldv2 queries with mldv1 reports in mldv1 fallback
net: bpf: arm: make hole-faulting more robust
net: tcp: add flag for ca to indicate that ECN is required
net: tcp: add DCTCP congestion control algorithm
ipv4: igmp: fix v3 general query drop monitor false positive
Daniel Mack (1):
net: ethernet: cpsw: improve interrupt lookup logic in cpsw_probe()
Darek Marcinkiewicz (1):
net: ec_bhf: remove excessive debug messages
David L Stevens (5):
sunvnet: upgrade to VIO protocol version 1.6
sunvnet: make transmit path zero-copy in the kernel
sunvnet: allow admin to set sunvnet MTU
sunvnet: generate ICMP PTMUD messages for smaller port MTUs
sunvnet: fix potential NULL pointer dereference
David S. Miller (120):
Merge branch 'bnx2x-next'
Merge tag 'linux-can-next-for-3.18-20140820' of git://gitorious.org/linux-can/linux-can-next
Merge git://git.kernel.org/.../davem/net
Merge branch 'tipc-next'
Merge branch 'bcm7xxx_apd_eee'
net: Allow raw buffers to be passed into the flow dissector.
Merge branch 'csums-next'
net: Add ops->ndo_xmit_flush()
igb: Support netdev_ops->ndo_xmit_flush()
virtio_net: Support netdev_ops->ndo_xmit_flush()
Merge branch 'ndo_xmit_flush'
Merge branch 'is_kdump_kernel'
net: Remove ndo_xmit_flush netdev operation, use signalling instead.
Merge branch 'bnx2x-next'
net: Update sk_buff flag bit availability comment.
f_ncm: Don't use netdev_start_xmit().
tulip: dmfe: Fix global namespace pollution of phy accessors.
sungem: Fix global namespace pollution of phy accessors.
sungem: Fix global namespace pollution of phy accessors.
Merge branch 'sf2'
Merge branch 'bcm7xxx'
igb: flush when in xmit_more mode and under descriptor pressure
virtio_net: flush when in xmit_more mode and under descriptor pressure
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'qlcnic-next'
Merge branch 'csums-next'
net: Do txq_trans_update() in netdev_start_xmit()
net: Create xmit_one() helper for dev_hard_start_xmit()
net: Move main gso loop out of dev_hard_start_xmit() into helper.
net: Pass a "more" indication down into netdev_start_xmit() code paths.
net: Have xmit_list() signal more==true when appropriate.
net: Separate out SKB validation logic from transmit path.
net: Validate xmit SKBs right when we pull them out of the qdisc.
net: Don't keep around original SKB when we software segment GSO frames.
net: xmit_list() becomes dev_hard_start_xmit().
Merge branch 'xmit_list'
Merge branch 'csums-next'
Merge branch 'be2net-next'
Merge branch 'netdev_modified'
Merge branch 'rx_copybreak'
Merge branch 'r8152-next'
Merge branch 'amd-xgbe-next'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'timestamping'
Merge branch 'eth_get_headlen'
Merge branch 'tcp'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge git://git.kernel.org/.../davem/net
Merge tag 'master-2014-09-08' of git://git.kernel.org/.../linville/wireless-next
Merge branch 'ebpf'
Merge branch 'bridge_rtnl_link'
Merge branch 'bpf-next'
Merge branch 'bond_lock_removal'
Merge branch 'ipip_sit_gro'
Merge git://git.kernel.org/.../pablo/nf-next
Merge branch 'cxgb4-next'
Merge branch 'sock_queue_err_skb'
Merge branch 'sched_rcu'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'bonding-next'
Merge branch 'ipv6-cleanups'
Merge branch 'be2net-next'
Merge branch 'fec-next'
Merge branch 'tcpflags'
Merge branch 'bonding-cleanups'
Merge branch 'dsa-next'
Merge branch 'net_next_ovs' of git://git.kernel.org/.../pshelar/openvswitch
Merge branch 'fec-next'
Merge branch 'udp-tunnel-common'
Merge branch 'fec-next'
Merge branch 'bnx2x-next'
Merge branch 'fou-next'
Merge branch 'mlx4-next'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'qlge'
Merge branch 'dsa-suspend'
Merge branch 'be2net-next'
Merge git://git.kernel.org/.../davem/net
Merge git://git.kernel.org/.../davem/net
Merge branch 'stmmac'
Merge branch 'gso_send_check'
Merge branch 'bpf-next'
Merge tag 'master-2014-09-16' of git://git.kernel.org/.../linville/wireless-next
Merge branch 'fec'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'tcp_skb_cb'
Merge branch 'dsa_eee'
Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec-next
Merge branch 'defxx-next'
Merge branch 'r8152'
Merge branch 'cxgb4-next'
Merge branch 'dctcp'
Merge branch 'qca7000_spi'
Merge branch 'arcnet-EAE'
Merge git://git.kernel.org/.../pablo/nf-next
Merge branch 'am335x'
Merge branch 'mlx4-next'
Merge branch 'pxa168_eth'
Merge branch 'sunvnet-jumbograms'
Merge branch 'bpf-next'
Merge branch 'udp_gso'
Merge git://git.kernel.org/.../davem/net
Merge branch 'qdisc_bulk_dequeue'
Merge branch 'rds-net'
Merge branch 'mlx5-next'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'gudp'
Merge branch 'spider_net'
Merge branch 'isdn-next'
Merge branch 'bridge_default_pvid'
Merge git://git.kernel.org/.../pablo/nf-next
Merge tag 'master-2014-10-02' of git://git.kernel.org/.../linville/wireless-next
Merge branch 'altera_tse'
Merge branch 'geneve'
Merge branch 'mlx4-next'
Merge branch 'net_sched-next'
Merge branch 'ipv6-next'
ipv6: Do not warn for informational ICMP messages, regardless of type.
Merge branch 'fs_enet_napi'
Merge git://git.kernel.org/.../davem/net
David Spinadel (2):
iwlwifi: mvm: enable passive fragmented scan changes
iwlwifi: mvm: reduce active dwell time
David Wood (1):
ethernet: nvidia: Remove extra parens
Dedy Lansky (7):
wil6210: Limit max number of associated stations
wil6210: fix for memory corruption while insmod
wil6210: fix for memory corruption upon rmmod
wil6210: fix race condition of disconnect while BACK event
wil6210: modify confusing printout
wil6210: fix race condition between BACK event and Rx data
wil6210: introduce separate completion for WMI
Dmitry Kravkov (6):
bnx2x: Utilize FW 7.10.51
bnx2x: ethtool -d might cause timeout in log
bnx2x: Be more forgiving toward SW GRO
bnx2x: prevent incorrect byte-swap in BE
bnx2x: fix tunneled GSO over IPv6
bnx2x: Changes with storage & MAC macros
Dong Aisheng (2):
can: m_can: add device tree binding documentation
can: m_can: add Bosch M_CAN controller support
Eli Cohen (5):
net/mlx5_core: Update device capabilities handling
net/mlx5_core: Use hardware registers description header file
net/mlx5_core: use set/get macros in device caps
net/mlx5_core: Identify resources by their type
net/mlx5_core: Add ConnectX-4 to list of supported devices
Eliad Peller (11):
mac80211: disable 40MHz support in case of 20MHz AP
iwlwifi: mvm: add use_ps-poll debugfs power option
iwlwifi: mvm: clear d0i3 state on recovery
cfg80211: avoid duplicate entries on regdomain intersection
mac80211: adjust roc duration when combining ROCs
mac80211: combine roc with the "next roc" if possible
cfg80211/mac80211: add wmm info to assoc event
cfg80211: allow requesting SMPS mode on ap start
mac80211: set smps_mode according to ap params
mac80211: replace SMPS hw flags with wiphy feature bits
iwlwifi: mvm: move IWL_MVM_UAPSD_QUEUES to constants.h
Emil Goode (1):
NFC: st21nfca: Remove double assignment of .owner in struct device_driver
Emil Tantilov (4):
ixgbe: reset interface on link loss with pending Tx work from the VF
ixgbevf: introduce delay for checking VFLINKS on 82599
ixgbe: remove wait loop on autoneg for copper devices
ixgbe: fix setting of TXDCTL.WTRHESH when ITR is set to 0 and no BQL
Emmanuel Grumbach (8):
iwlwifi: mvm: reduce the AMPDU size in low latency mode
iwlwifi: mvm: use dynamic SMPS for P2P Client
iwlwifi: mvm: force protection for P2P
Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT
iwlwifi: trans: don't configure the set_active in SCD for dvm
iwlwifi: define the non shared antenna per hardware
iwlwifi: mvm: allow to collect debug data when restart is disabled
iwlwifi: mvm: disable BT Co-running by default
Eran Harary (3):
iwlwifi: mvm: fix the dump_umac_error_log
iwlwifi: mvm: fix comment typo
iwlwifi: mvm: allow preventing dummy notifications
Eric Dumazet (60):
net: use ktime_get_ns() and ktime_get_real_ns() helpers
net: remove dead code after sk_data_ready change
ipv4: fix a race in update_or_create_fnhe()
ipv4: harden fnhe_hashfun()
tcp: introduce TCP_SKB_CB(skb)->tcp_tw_isn
tcp: remove TCP_SKB_CB(skb)->when
mlx4: only pull headers into skb head
tcp: remove dst refcount false sharing for prequeue mode
ipv4: rcu cleanup in ip_ra_control()
ipv6: udp6_gro_complete() is static
netns: remove one sparse warning
ipv4: udp4_gro_complete() is static
tcp: use TCP_SKB_CB(skb)->tcp_flags in input path
tcp: allow segment with FIN in tcp_try_coalesce()
tcp: do not copy headers in tcp_collapse()
tcp: do not fake tcp headers in tcp_send_rcvq()
net: add alloc_skb_with_frags() helper
net: sched: use __skb_queue_head_init() where applicable
tcp: avoid possible arithmetic overflows
net: sched: fix compile warning in cls_u32
icmp: add a global rate limitation
tcp: add coalescing attempt in tcp_ofo_queue()
net: sched: use pinned timers
net: introduce __skb_header_release()
net : optimize skb_release_data()
ipv4: rename ip_options_echo to __ip_options_echo()
ipv6: add a struct inet6_skb_parm param to ipv6_opt_accepted()
tcp: better TCP_SKB_CB layout to reduce cache line misses
tcp: change tcp_skb_pcount() location
mlx4: exploit skb->xmit_more to conditionally send doorbell
dql: dql_queued() should write first to reduce bus transactions
net: reorganize sk_buff for faster __copy_skb_header()
ipv4: mentions skb_gro_postpull_rcsum() in inet_gro_receive()
net: cleanup and document skb fclone layout
net: avoid one atomic operation in skb_clone()
qdisc: validate skb without holding lock
net: do not export skb_gro_receive()
mlx4: add a new xmit_more counter
net: skb_segment() provides list head and tail
net: sched: avoid costly atomic operation in fq_dequeue()
net/mlx4_en: Code cleanups in tx path
net/mlx4_en: Align tx path structures to cache lines
net/mlx4_en: Avoid calling bswap in tx fast path
net/mlx4_en: tx_info allocated with kmalloc() instead of vmalloc()
net/mlx4_en: Avoid a cache line miss in TX completion for single frag skb's
net/mlx4_en: Use prefetch in tx path
net/mlx4_en: Avoid false sharing in mlx4_en_en_process_tx_cq()
net/mlx4_en: mlx4_en_xmit() reads ring->cons once, and ahead of time to avoid stalls
net/mlx4_en: Use local var in tx flow for skb_shinfo(skb)
net/mlx4_en: Use local var for skb_headlen(skb)
net/mlx4_en: tx_info->ts_requested was not cleared
net/mlx4_en: Enable the compiler to make is_inline() inlined
ethtool: Ethtool parameter to dynamically change tx_copybreak
net/mlx4_en: Use the new tx_copybreak to set inline threshold
net: introduce netdevice gso_min_segs attribute
net: validate_xmit_vlan() is static
net/mlx4_en: remove NETDEV_TX_BUSY
net: better IFF_XMIT_DST_RELEASE support
i40e: skb->xmit_more support
net: add netdev_txq_bql_{enqueue, complete}_prefetchw() helpers
Erik Hugne (3):
tipc: refactor name table updates out of named packet receive routine
tipc: add name distributor resiliency queue
tipc: fix sparse warnings
Ethan Zhao (4):
i40e: use global pci_vfs_assigned() to replace local i40e_vfs_are_assigned()
ixgbevf: remove useless bd_number from struct ixgbevf_adapter
ixgbe: remove useless bd_number from adapter struct
ixgbe: delete one duplicate marcro definition of IXGBE_MAX_L2A_QUEUES
Eyal Shapira (11):
iwlwifi: mvm: disable tx aggregation on low latency vifs
mac80211: fix broken use of VHT/20Mhz with some APs
iwlwifi: mvm: add LDPC support
iwlwifi: enable LDPC in 8000 chip family
iwlwifi: mvm: rs: remove max_rate_idx
iwlwifi: mvm: rs: don't zero tx stats after idle
iwlwifi: mvm: choose an initial tx rate based on rssi conditions
iwlwifi: mvm: rs: refactor to allow direct rs updating
iwlwifi: mvm: limit aggregation size in low latency to 6
iwlwifi: mvm: report all BA notifs to RS
iwlwifi: mvm: rs: fix logic in case of multiple TIDs
Fabian Frederick (16):
net: fec: use container_of to resolve bufdesc_ex from bufdesc
bna: use container_of to resolve bufdesc_ex from bufdesc
brcm80211: use container_of to resolve brcms_phy from brcms_phy_pub
brcm80211: use container_of to resolve dma_info from dma_pub
irda: add __init to irlan_open
ieee802154: add __init to lowpan_frags_sysctl_register
ieee802154: fix __init functions
tcp: add __init to tcp_init_mem
inet: frags: add __init to ip4_frags_ctl_register
cipso: add __init to cipso_v4_cache_init
net/dccp/proto.c: add __init to dccp_mib_init
net/dccp/ccid.c: add __init to ccid_activate
net: fix rcu access on phonet_routes
af_unix: remove 0 assignment on static
wimax: convert printk to pr_foo()
netlabel: directly return netlbl_unlabel_genl_init()
Fabio Estevam (2):
fec: Remove fec_enet_select_queue()
fec: Fix fec_enet_alloc_buffers() error path
Felix Fietkau (7):
ath5k: add missing include for debug code
ath9k: use ah->get_mac_revision for all SoC devices if available
ath9k_hw: disable hardware ad-hoc flag on ar934x rev 3
Revert "ath9k_hw: reduce ANI firstep range for older chips"
ath9k_hw: reduce ANI spur immunity setting on HT40 extension channel
ath9k_hw: fix PLL clock initialization for newer SoC
ath9k: fix getting tx duration for dynack
Florian Fainelli (52):
net: phy: broadcom: extract all registers to brcmphy.h
net: phy: broadcom: move shadow 0x1C register accessors to brcmphy.h
net: phy: bcm7xxx: enable auto power down
net: phy: fixed: return an error for Clause 45 over 22 reads
net: phy: export phy_{read,write}_mmd_indirect
net: phy: allow phy_init_eee() to work with internal PHYs
net: phy: bcm7xxx: enable EEE at the PHY level
net: dsa: reduce number of protocol hooks
net: phy: add generic UniMAC MDIO bus driver
net: phy: provide stub for fixed_phy_set_link_update
net: dsa: provide a switch device device tree node pointer
net: dsa: retain a per-port device_node pointer
net: dsa: allow for more complex PHY setups
net: dsa: allow switches to work without tagging
net: dsa: allow drivers to do link adjustment
net: dsa: allow updating fixed PHY link information
net: dsa: add Broadcom tag RX/TX handler
net: dsa: add Broadcom SF2 switch driver
Documentation: devicetree: update dsa binding with optional properties
Documentation: devicetree: add Broadcom Starfighter 2 binding
net: phy: bcm7xxx: introduce helper macro
net: phy: broadcom: fix PHY_BCM_OUI_4
net: phy: broadcom: add new Broadcom OUI
net: phy: bcm7xxx: add BCM7250 and BCM7364 PHY entries
net: phy: properly report internal PHYs through sysfs
net: systemport: tell RXCHK if we are using Broadcom tags
net: dsa: make dsa_pack_type static
net: phy: mdio-bcm-unimac: NULL-terminate unimac_mdio_ids
net: systemport: update UMAC_CMD only when link is detected
net: dsa: change tag_protocol to an enum
net: dsa: fix mii_bus to host_dev replacement
of: mdio: honor flags passed to of_phy_connect
net: phy: broadcom: add helper for PHY revision and patch level
net: phy: bcm7xxx: do not use PHY_BRCM_100MBPS_WAR
net: bcmgenet: remove PHY_BRCM_100MBPS_WAR
net: bcmgenet: communicate integrated PHY revision to PHY driver
net: dsa: allow switch drivers to specify phy_device::dev_flags
net: dsa: bcm_sf2: communicate integrated PHY revision to PHY driver
net: phy: bcm7xxx: utilize PHY revision in config_init
net: dsa: allow switch drivers to implement suspend/resume hooks
net: dsa: bcm_sf2: add suspend/resume callbacks
net: dsa: add {get, set}_wol callbacks to slave devices
net: dsa: bcm_sf2: add support for Wake-on-LAN
net: dsa: start and stop the PHY state machine
net: dsa: allow enabling and disable switch ports
net: dsa: bcm_sf2: disable RGMII interface(s) when link is down
net: dsa: bcm_sf2: add port_enable/disable callbacks
net: dsa: allow switches driver to implement get/set EEE
net: dsa: bcm_sf2: add support for controlling EEE
net: bridge: add a br_set_state helper function
net: systemport: fix bcm_sysport_insert_tsb()
net: dsa: do not call phy_start_aneg
Florian Westphal (18):
tcp: syncookies: mark cookie_secret read_mostly
net_sched: sfq: remove unused macro
net: use kfree_skb_list() helper in more places
e1000: move e1000_tbi_adjust_stats to where its used
e1000: move tbi workaround code into helper function
e1000: perform copybreak ahead of DMA unmap
e1000: add and use e1000_rx_buffer info for Rx
e1000: rename struct e1000_buffer to e1000_tx_buffer
e1000: convert to build_skb
e1000: switch to napi_gro_frags api
net: tcp: assign tcp cong_ops when tcp sk is created
net: tcp: split ack slow/fast events from cwnd_event
net: tcp: more detailed ACK events and events for CE marked packets
netfilter: conntrack: disable generic tracking for known protocols
tcp: move TCP_ECN_create_request out of header
tcp: change TCP_ECN prefixes to lower case
netfilter: bridge: build br_nf_core only if required
r8169: add support for Byte Queue Limits
Francois Romieu (1):
r8169: add missing MODULE_FIRMWARE.
Frank Li (7):
net: fec: init multi queue date structure
net: fec: add enet-avb IP support
ARM: Documentation: Update fec dts binding doc
ARM: dts: imx6sx: add multi-queue support enet
net: fec: fix build error at m68k platform
net: fec: refine error handle of parser queue number from DT
net: fec: fix build error at m68k platform
Fugang Duan (11):
net:fec: add enet refrence clock for i.MX 6SX chip
net:fec: add enet AVB feature macro define for imx6sx
net: fec: change data structure to support multiqueue
net: fec: parser max queue number from dt file
net:fec: Disable enet-avb MAC instead of reset MAC
net:fec: Add fsl,imx6sx-fec compatible strings
net: fec: change FEC alignment according to i.mx6 sx requirement
net: fec: init complete variable in early to avoid kernel dump
net: fec: add interrupt coalescence feature support
net:fec: increase DMA queue number
net: fec: Workaround for imx6sx enet tx hang when enable three queues
Govindarajulu Varadarajan (3):
enic: implement rx_copybreak
ethtool: Add generic options for tunables
enic: Add tunable_ops support for rx_copybreak
Guenter Roeck (1):
next: mips: bpf: Fix build failure
Haiyang Zhang (1):
hyperv: Increase the buffer length for netvsc_channel_cb()
Hannes Frederic Sowa (8):
ipv6: add sysctl_mld_qrv to configure query robustness variable
ipv4: implement igmp_qrv sysctl to tune igmp robustness variable
net: filter: constify detection of pkt_type_offset
ipv6: minor fib6 cleanups like type safety, bool conversion, inline removal
ipv6: make rt_sernum atomic and serial number fields ordinary ints
ipv6: only generate one new serial number per fib mutation
ipv6: make fib6 serial number per namespace
ipv6: don't walk node's leaf during serial number update
Hans Wennborg (4):
ath6kl: fix %d confusingly prefixed with 0x in format strings
mwifiex: fix decimal printf format specifiers prefixed with 0x
iwl4965: fix %d confusingly prefixed with 0x in format string
rtlwifi: fix %d confusingly prefixed with 0x in format strings
Hante Meuleman (5):
brcmfmac: On scan timeout do send received results.
brcmfmac: Fix sign issue with IOCTL return code in msgbuf.
brcmfmac: Avoid usage of GFP_ATOMIC.
brcmfmac: Fix crash on cleanup.
brcmfmac: Add wowl support for PCIE devices.
Hariprasad Shenai (9):
cxgb4: Allow T4/T5 firmware sizes up to 1MB
cxgb4: Add support to S25FL032P flash
cxgb4: Fix t4_flash_erase_sectors() to throw an error when requested to erase sectors which aren't in the FLASH
cxgb4: Add warning msg when attaching to adapters which have FLASHes smaller than 2Mb
cxgb4/cxgb4vf: Add device ID for new adapter and remove for dbg adapter
cxgb4: Use BAR2 Going To Sleep (GTS) for T5 and later.
cxgb4vf: Remove superfluous "idx" parameter of CH_DEVICE() macro.
cxgb4/cxgb4vf: Add Devicde ID for two more adapter
cxgb4: Add support for adaptive rx
Harish Patil (2):
qlge: Fix compilation warning
Update qlge driver maintainers list
Hauke Mehrtens (9):
bcma: only map wrapper if its address is available
bcma: store more alternative addresses
bcma: add support for chipcommon B core
b43: tell the ucode the mac capabilities
b43: tell ucode the phy type and version
b43: add missing rate
b43: update some transmit header constants
b43: add support for setting the beacon listen interval
bcma: register bcma as device tree driver
Herbert Xu (2):
ipsec: Remove obsolete MAX_AH_AUTH_LEN
bridge: Save frag_max_size between PRE_ROUTING and POST_ROUTING
Herton R. Krzesinski (3):
net/rds: call rds_conn_drop instead of open code it at rds_connect_complete
net/rds: do proper house keeping if connection fails in rds_tcp_conn_connect
net/rds: fix possible double free on sock tear down
Himangi Saraogi (17):
ath6kl: convert a driver to use module_usb_driver()
Bluetooth: Remove typedef bluecard_info_t
Bluetooth: Remove typedef btuart_info_t
Bluetooth: Remove typedefs nsh_t and dtl1_info_t
Bluetooth: Remove typedef bt3c_info_t
can: mcp251x: Use dmam_alloc_coherent
isdn/gigaset: use USB API functions rather than constants
isdn/bas_gigaset: use USB API functions rather than constants
dn_dev: Use time_before
ipconfig: Use time_before
decnet: Use time_after_eq
af_decnet: Use time_after_eq
net: wireless: wl1251: Remove unnecessary free_irq
cw1200: Introduce the use of devm_kzalloc
wireless: wlcore: Use devm_kzalloc
atmel_cs: Remove typedef local_info_t
orinoco_usb: use USB API functions rather than constants
Ian Morris (3):
ipv6: White-space cleansing : Line Layouts
ipv6: White-space cleansing : Structure layouts
ipv6: White-space cleansing : gaps between function and symbol export
Ido Shamay (3):
net/mlx4_core: Enable CQE/EQE stride support
net/mlx4_core: Cache line EQE size support
net/mlx4_en: Add mlx4_en_get_cqe helper
Ido Yariv (3):
mac80211: Fix accounting of the tailroom-needed counter
mac80211: don't resize skbs needlessly
iwlwifi: mvm: support cloned tx skbs
Ignacy Gawędzki (1):
ematch: Fix early ending of inverted containers.
Ivan Vecera (1):
bna: allow transmit tagged frames
Jack Morgenstein (3):
net/mlx4_core: Don't disable SRIOV if there are active VFs
net/mlx4_core: Protect QUERY_PORT wrapper from untrusted guests
net/mlx4_core: Deprecate error message at ConnectX-2 cards startup to debug
Jacob Keller (10):
ixgbe: add comment noting recalculation of queues
ixgbe: limit combined total of macvlan and SR-IOV VFs
ixgbe: use e_dev_warn instead of netif_printk
ixgbe: return integer from ixgbe_acquire_msix_vectors
ixgbe: move msix_entries allocation into ixgbe_acquire_msix_vectors
ixgbe: determine vector count inside ixgbe_acquire_msix_vectors
ixgbe: use e_dev_warn instead of e_err for displaying warning
ixgbe: use e_dev_warn instead of netif_printk
ixgbe: add warnings for other disabled features without MSI-X support
ixgbe: remove IXGBE_FLAG_MSI(X)_CAPABLE flags
Jade Bilkey (1):
ath5k: added debugfs file for dumping eeprom
Janusz Dziedzic (1):
ath10k: extend debug code for RX path
Jason Wang (1):
net: keep original skb which only needs header checking during software GSO
Jeff Kirsher (1):
am2150: Update nmclan_cs.c to use update PCMCIA API
Jesper Dangaard Brouer (6):
pktgen: add flag NO_TIMESTAMP to disable timestamping
qdisc: adjustments for API allowing skb list xmits
qdisc: exit case fixes for skb list handling in qdisc layer
qdisc: validate frames going through the direct_xmit path
qdisc: bulk dequeue support for qdiscs with TCQ_F_ONETXQUEUE
qdisc: dequeue bulking also pickup GSO/TSO packets
Jesse Brandeburg (2):
i40e: make warning less verbose
i40e: fix panic due to too-early Tx queue enable
Jesse Gross (5):
openvswitch: Eliminate memset() from flow_extract.
openvswitch: Add support for matching on OAM packets.
openvswitch: Wrap struct ovs_key_ipv4_tunnel in a new structure.
openvswitch: Factor out allocation and verification of actions.
openvswitch: Add support for Geneve tunneling.
Jingoo Han (1):
ethernet: arc: remove unused dev
Jiri Pirko (8):
bonding: create netlink event when bonding option is changed
team: set IFF_TEAM_PORT priv_flag after rx_handler is registered
bonding: add slave netlink policy and put slave-related ops together
bridge: switch order of rx_handler reg and upper dev link
bridge: implement rtnl_link_ops->get_slave_size and rtnl_link_ops->fill_slave_info
bridge: implement rtnl_link_ops->slave_changelink
bridge: implement rtnl_link_ops->get_size and rtnl_link_ops->fill_info
bridge: implement rtnl_link_ops->changelink
Jitendra Kalsaria (2):
qlcnic: Update Link speed and port type info for 83xx adapter
qlcnic: Use usleep_range() instead of msleep() for sleep less than 20ms
Joe Lawrence (1):
team: avoid race condition in scheduling delayed work
Joe Perches (8):
drivers/net: Convert remaining uses of pr_warning to pr_warn
atm: Convert pr_warning to pr_warn
pktgen: Convert pr_warning to pr_warn
iucv: Convert pr_warning to pr_warn
netfilter: Convert pr_warning to pr_warn
Bluetooth: Convert bt_<level> logging functions to return void
mellanox: Change en_print to return void
net: Change netdev_<level> logging functions to return void
Johan Hedberg (82):
Bluetooth: Add convenience function to check for pending power off
Bluetooth: Create unified helper function for updating page scan
Bluetooth: Disable page scan if all whitelisted devices are connected
Bluetooth: Remove redundant check for remote_key_dist
Bluetooth: Fix confusion between parent and child channel for 6lowpan
Bluetooth: Fix reference counting of global L2CAP channels
Bluetooth: Fix __l2cap_no_conn_pending() usage with all channels
Bluetooth: Resume BT_CONNECTED state after LE security elevation
Bluetooth: Remove special handling of ATT in l2cap_security_cfm()
Bluetooth: Refactor l2cap_connect_cfm
Bluetooth: Move L2CAP fixed channel creation into l2cap_conn_cfm
Bluetooth: Improve fixed channel lookup based on link type
Bluetooth: Remove special ATT data channel handling
Bluetooth: Move parts of fixed channel initialization to l2cap_add_scid
Bluetooth: Call L2CAP teardown callback before clearing chan->conn
Bluetooth: Call l2cap_le_conn_ready after notifying channels
Bluetooth: Fix using HCI_CONN_LE_SMP_PEND to check for SMP context
Bluetooth: Fix hci_update_random_address() error return for no crypto
Bluetooth: Fix IRK lookup when tfm_aes is not available
Bluetooth: Refactor SMP (de)initialization into separate functions
Bluetooth: Move SMP initialization after HCI init
Bluetooth: Move SMP (de)initialization to smp.c
Bluetooth: Add more L2CAP convenience callbacks
Bluetooth: Add SMP L2CAP channel skeleton
Bluetooth: Make AES crypto context private to SMP
Bluetooth: Convert SMP to use l2cap_chan infrastructure
Bluetooth: Use L2CAP resume callback to call smp_distribute_keys
Bluetooth: Add public l2cap_conn_shutdown() API to request disconnection
Bluetooth: Call l2cap_conn_shutdown() when SMP recv callback fails
Bluetooth: Fix double free of SMP data skb
Bluetooth: Add SMP-internal timeout callback
Bluetooth: Remove unused l2cap_conn->security_timer
Bluetooth: Move canceling security_timer into smp_chan_destroy()
Bluetooth: Always call smp_distribute_keys() from a workqueue
Bluetooth: Make smp_chan_destroy() private to smp.c
Bluetooth: Fix incorrect LE CoC PDU length restriction based on HCI MTU
Bluetooth: Remove unnecessary l2cap_chan_unlock before l2cap_chan_add
Bluetooth: Fix hci_conn reference counting for fixed channels
Bluetooth: Set addr_type only when it's needed
Bluetooth: Optimize connection parameter lookup for LE connections
Bluetooth: Improve *_get() functions to return the object type
Bluetooth: Fix using hci_conn_get() for hci_conn pointers
Bluetooth: Refactor connection parameter freeing into its own function
Bluetooth: Use zero timeout for immediate scheduling
Bluetooth: Fix hci_conn reference counting with hci_chan
Bluetooth: Set disc_timeout to 0 when calling hci_chan_del
Bluetooth: Ignore incoming data after initiating disconnection
Bluetooth: Remove hci_conn_hold/drop from hci_chan
Bluetooth: Set discon_timeout to 0 in l2cap_conn_del
Bluetooth: Use hci_disconnect for immediate disconnection from SMP
Bluetooth: Remove unused l2cap_conn_shutdown API
Bluetooth: Fix SMP error and response to be mutually exclusive
Bluetooth: Update hci_disconnect() to return an error value
Bluetooth: Use hci_disconnect() for mgmt_disconnect_device()
Bluetooth: Move clock offset reading into hci_disconnect()
Bluetooth: Add clarifying comment for LE CoC result value
Bluetooth: Remove unnecessary checks after canceling SMP security timer
Bluetooth: Don't take any action in smp_resume_cb if not encrypted
Bluetooth: Move identity address update behind a workqueue
Bluetooth: Remove unnecessary deferred work for SMP key distribution
Bluetooth: Fix locking of the SMP context
Bluetooth: Add define for key distribution mask
Bluetooth: Fix calling smp_distribute_keys() when still waiting for keys
Bluetooth: Add strict checks for allowed SMP PDUs
Bluetooth: Fix dereferencing conn variable before NULL check
Bluetooth: Fix mgmt pairing failure when authentication fails
Bluetooth: Fix allowing SMP Signing info PDU
Bluetooth: Remove unnecessary early initialization of variable
Bluetooth: Fix ignoring unknown SMP authentication requirement bits
Bluetooth: Centralize disallowing SMP commands to a single place
Bluetooth: Fix SMP security level when we have no IO capabilities
Bluetooth: Add smp_ltk_sec_level() helper function
Bluetooth: Fix L2CAP information request handling for fixed channels
Bluetooth: Avoid hard-coded IO capability values in SMP
Bluetooth: Expire RPA if encryption fails
Bluetooth: Fix re-setting RPA as expired when deferring update
Bluetooth: btusb: Use GFP_KERNEL in btusb_send_frame()
Bluetooth: Fix setting correct security level when initiating SMP
Bluetooth: Fix reason code used for rejecting SCO connections
Bluetooth: Add retransmission effort into SCO parameter table
Bluetooth: Rename sco_param_wideband table to esco_param_msbc
Bluetooth: Fix lockdep warning with l2cap_chan_connect
Johannes Berg (34):
mac80211: don't duplicate station QoS capability data
mac80211: make ieee80211_vif_use_reserved_switch static
cfg80211: clarify BSS probe response vs. beacon data
cfg80211: allow passing frame type to cfg80211_inform_bss()
iwlwifi: make U-APSD default configurable at compile time
iwlwifi: trans: refactor txq_enable arguments
iwlwifi: mvm: add some debugging to quota allocation
iwlwifi: don't export tracepoints unnecessarily
iwlwifi: trans: allow skipping scheduler hardware config
iwlwifi: trans: make aggregation explicit for TX queue handling
iwlwifi: add Intel Mobile Communications copyright
iwlwifi: mvm: correct firmware disassoc command sequence
iwlwifi: mvm: clean up FIFO definitions
iwlwifi: mvm: clarify stop_count, remove transport_stopped
iwlwifi: mvm: use tdls indication from mac80211
iwlwifi: mvm: use iwl_mvm_mac_get_queues_mask() more
iwlwifi: mvm: clean up broadcast station handling
iwlwifi: mvm: clean up AUX station handling
mac80211: clean up ieee80211_i.h
mac80211: add Intel Mobile Communications copyright
cfg80211: add Intel Mobile Communications copyright
mac80211: annotate MMIC head/tailroom warning
cfg80211: clear connect keys when freeing them
mac80211: clear key material when freeing keys
cfg80211: clear wext keys when freeing and removing them
cfg80211: don't put kek/kck/replay counter on the stack
cfg80211: clear nl80211 messages carrying keys after processing
cfg80211: add WMM traffic stream API
iwlwifi: mvm: disable aggregation queues in station DB in FW
iwlwifi: pcie: clear command data on freeing
iwlwifi: mvm: don't update quota in firmware too often
iwlwifi: mvm: update d0i3 debugfs
iwlwifi: mvm: fix quota update avoidance
iwlwifi: mvm: update QoS parameters when they change
John Fastabend (41):
net: qdisc: use rcu prefix and silence sparse warnings
net: rcu-ify tcf_proto
net: sched: cls_basic use RCU
net: sched: cls_cgroup use RCU
net: sched: cls_flow use RCU
net: sched: fw use RCU
net: sched: RCU cls_route
net: sched: RCU cls_tcindex
net: sched: make cls_u32 per cpu
net: sched: make cls_u32 lockless
net: sched: rcu'ify cls_rsvp
net: sched: rcu'ify cls_bpf
net: qdisc: use rcu prefix and silence sparse warnings
net: rcu-ify tcf_proto
net: sched: cls_basic use RCU
net: sched: cls_cgroup use RCU
net: sched: cls_flow use RCU
net: sched: fw use RCU
net: sched: RCU cls_route
net: sched: RCU cls_tcindex
net: sched: make cls_u32 per cpu
net: sched: make cls_u32 lockless
net: sched: rcu'ify cls_rsvp
net: sched: rcu'ify cls_bpf
net: sched: fix unsued cpu variable
net: sched: cls_u32 add missing rcu_assign_pointer and annotation
net: sched: cls_cgroup fix possible memory leak of 'new'
net: sched: cls_fw: add missing tcf_exts_init call in fw_change()
net: sched: cls_cgroup need tcf_exts_init in all cases
net: sched: cls_u32: rcu can not be last node
net: cls_u32: fix missed pcpu_success free_percpu
net: sched: cls_u32 changes to knode must appear atomic to readers
net: sched: cls_rcvp, complete rcu conversion
net: sched: make bstats per cpu and estimator RCU safe
net: sched: implement qstat helper routines
net: sched: restrict use of qstats qlen