There are a couple non-trivial merge conflicts to deal with here. The first has to do with Stephen Rothwells movement of trace entries into individual files while meanwhile the wireless folks were adding new ones or changing the signature of existing ones. For net/mac80211/trace.h, keep the hunk that adds the drv_wake_tx_queue trace event. Then remove the hunk from "#ifdef CONFIG_MAC80211_MESSAGE_TRACING" until the "#endif" closing that ifdef. For drivers/net/wireless/iwlwifi/iwl-devtrace.h, take the trace entry definition for iwlwifi_dev_ucode_error from my tree and use it to replace what is in drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h Then remove everything else in the conflict section of iwl-devtrace.h The second set of conflicts have to do with BPF stuff. samples/bpf/Makefile - Trivial, overlapping additions. include/uapi/linux/bpf.h - Likewise. In kernel/events/core.c you'll have to change "prog->aux->prog_type" into "prog->type". In include/linux/bpf.h, keep the bpf_prog_{get,put}() stuff that's protected by the BPF_SYSCALL ifdef. Highlights: 1) Add BQL support to via-rhine, from Tino Reichardt. 2) Integrate SWITCHDEV layer support into the DSA layer, so DSA drivers can support hw switch offloading. From Floria Fainelli. 3) Allow 'ip address' commands to initiate multicast group join/leave, from Madhu Challa. 4) Many ipv4 FIB lookup optimizations from Alexander Duyck. 5) Support EBPF in cls_bpf classifier and act_bpf action, from Daniel Borkmann. 6) Remove the ugly compat support in ARP for ugly layers like ax25, rose, etc. And use this to clean up the neigh layer, then use it to implement MPLS support. All from Eric Biederman. 7) Support L3 forwarding offloading in switches, from Scott Feldman. 8) Collapse the LOCAL and MAIN ipv4 FIB tables when possible, to speed up route lookups even further. From Alexander Duyck. 9) Many improvements and bug fixes to the rhashtable implementation, from Herbert Xu and Thomas Graf. In particular, in the case where an rhashtable user bulk adds a large number of items into an empty table, we expand the table much more sanely. 10) Don't make the tcp_metrics hash table per-namespace, from Eric Biederman. 11) Extend EBPF to access SKB fields, from Alexei Starovoitov. 12) Split out new connection request sockets so that they can be established in the main hash table. Much less false sharing since hash lookups go direct to the request sockets instead of having to go first to the listener then to the request socks hashed underneath. From Eric Dumazet. 13) Add async I/O support for crytpo AF_ALG sockets, from Tadeusz Struk. 14) Support stable privacy address generation for RFC7217 in IPV6. From Hannes Frederic Sowa. 15) Hash network namespace into IP frag IDs, also from Hannes Frederic Sowa. 16) Convert PTP get/set methods to use 64-bit time, from Richard Cochran. Please pull, thanks a lot! The following changes since commit f22e6e847115abc3a0e2ad7bb18d243d42275af1: Linux 4.0-rc7 (2015-04-06 15:39:45 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git for you to fetch changes up to 9f9151412dd7aae0e3f51a89ae4a1f8755fdb4d0: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (2015-04-14 22:29:27 -0400) ---------------------------------------------------------------- Aaron Wu (3): bfin_can: rewrite the blackfin style of read/write to common ones bfin_can: introduce ioremap to comply to archs with MMU bfin_can: Merge header file from arch dependent location Achiad Shochat (3): net/mlx5_core: Use the right inbox struct in destroy mkey command net/mlx5_core: Fix a bug in alloc_token net/mlx5_core: Update module info macros for ConnectX4 Support Ahmad Kholaif (1): cfg80211: Allow NL80211_ATTR_IFINDEX to be added to vendor events Ahmed S. Darwish (1): can: kvaser_usb: Use can-dev unregistration mechanism Ajit Khaparde (1): be2net: Fix a bug in Rx buffer posting Akeem G Abodunrin (3): i40e: Add safety net for switch calling i40e: Move code to enable/disable Loopback to the main file i40e: Increase PF reset max loop limit Al Viro (9): crypto: Fix regressions caused by iov_iter changes. Merge branch 'iocb' into for-davem Merge branch 'iov_iter' into for-davem net: switch sendto() and recvfrom() to import_single_range() net: switch importing msghdr from userland to {compat_,}import_iovec() switch kernel_sendmsg() and kernel_recvmsg() to iov_iter_kvec() get rid of the size argument of sock_sendmsg() Merge remote-tracking branch 'dh/afs' into for-davem new helper: msg_data_left() Aleksander Morgado (1): hso: always read interface number from the current altsetting Alessio Igor Bogani (1): net: phy: broadcom: Add BCM54616S phy entry Alex W Slater (1): ipv6: Replace "#include " with "#include " Alexander Aring (31): ieee802154: correct ieee802154_is_valid_psdu_len ieee802154: cleanup ieee802154_be64_to_le64 ieee802154: cleanup ieee802154_le64_to_be64 6lowpan: add generic nhc layer interface 6lowpan: add udp compression via nhc layer 6lowpan: nhc: add other known rfc6282 compressions at86rf230: copy pdata to driver allocated space at86rf230: add support for external xtal trim at86rf230: remove tx_timeout at86rf230: add irqmask mode setting at86rf230: add irq low-level for polarity at86rf230: add warning if edge-triggered irq at86rf230: add transmit retry support at86rf230: cleanup and squash stack variable at86rf230: refactor receive handling at86rf230: remove multiple dereferencing for irq at86rf230: remove multiple dereferencing for ctx at86rf230: restore trx len when needed Bluetooth: fix sco_exit compile warning ieee802154: 6lowpan: fix ARPHRD to ARPHRD_6LOWPAN ieee802154: change wpan-phy name to phy ieee802154: remove deprecated sysfs entries mac802154: correct max sifs size handling at86rf230: init xtal_trim with zero at86rf230: replace state change sleeps with hrtimer at86rf230: add support for calibration timeout at86rf230: fix volatile regmap registers at86rf230: fix at86rf230_read_subreg succeed handling mac802154: cleanup concurrent check at86rf230: remove unnecessary spinlock at86rf230: fix is_tx while error handling Alexander Bondar (2): mac80211: Update beacon's timing and DTIM count on every beacon iwlwifi: mvm: Clean up UMAC scan UIDs in the reset and drv_stop flows Alexander Drozdov (2): af_packet: make tpacket_rcv to not set status value before run_filter af_packet: pass checksum validation status to the user Alexander Duyck (45): fib_trie: Convert fib_alias to hlist from list fib_trie: Replace plen with slen in leaf_info fib_trie: Add slen to fib alias fib_trie: Remove leaf_info fib_trie: Only resize tnodes once instead of on each leaf removal in fib_table_flush fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leaf fib_trie: Fib find node should return parent fib_trie: Update insert and delete to make use of tp from find_node fib_trie: move leaf and tnode to occupy the same spot in the key vector fib_trie: Make fib_table rcu safe fib_trie: Update last spot w/ idx >> n->bits code and explanation fib_trie: Prevent allocating tnode if bits is too big for size_t igb: Fix warning pin may be used uninitialized igb: Make arrays on stack static const to avoid reallocation fib_trie: Minor cleanups to fib_table_flush_external fib_trie: Return pointer to tnode pointer in resize/inflate/halve fib_trie: Rename tnode to key_vector fib_trie: replace tnode_get_child functions with get_child macros fib_trie: Rename tnode_child_length to child_length fib_trie: Add tnode struct as a container for fields not needed in key_vector fib_trie: Move rcu from key_vector to tnode, add accessors. fib_trie: Pull empty_children and full_children into tnode fib_trie: Move parent from key_vector to tnode fib_trie: Add key vector to root, return parent key_vector in resize fib_trie: Correctly handle case of key == 0 in leaf_walk_rcu fib_trie: Address possible NULL pointer dereference in resize ipv4: FIB Local/MAIN table collapse fib_trie: Fix uninitialized variable warning fib_trie: Only display main table in /proc/net/route fib_trie: Avoid NULL pointer if local table is not allocated fib_trie: Provide a deterministic order for fib_alias w/ tables merged ixgbe: Remove IXGBE_FLAG_IN_NETPOLL since it doesn't do anything fib_trie: Fix regression in handling of inflate/halve failure fib_trie: Fix warning on fib4_rules_exit fib_trie: Cleanup ip_fib_net_exit code path jhash: Update jhash_[321]words functions to use correct initval sungem, sunhme, sunvnet: Update drivers to use dma_wmb/rmb s2io: Update driver to use dma_wmb e1000, e1000e: Use dma_rmb instead of rmb for descriptor read ordering cxgb3/4/4vf: Update drivers to use dma_rmb/wmb where appropriate mlx4/mlx5: Use dma_wmb/rmb where appropriate i40e/i40evf: Use dma_rmb where appropriate e100: Use dma_rmb/wmb where appropriate ixgbe: Remove NETIF_F_HW_VLAN_CTAG_FILTER from hw_features ixgbe: Drop unnecessary call to rcu_barrier Alexander Ploumistos (1): Bluetooth: ath3k: Add support Atheros AR5B195 combo Mini PCIe card Alexei Starovoitov (5): bpf: allow extended BPF programs access skb fields samples: bpf: add skb->field examples and tests bpf: allow BPF programs access 'protocol' and 'vlan_tci' fields tc: bpf: generalize pedit action tc: bpf: add checksum helpers Alexey Dobriyan (1): xfrm: fix xfrm_input/xfrm_tunnel_check oops Ameen Ali (1): net: __aligned(size) is preferred over __attribute__((aligned(size))) Amitkumar Karwar (2): Bluetooth: btmrvl: support SCO routing to host interface mwifiex: use del_timer variant in interrupt context Andi Kleen (1): fou: Don't use const __read_mostly Andrew Bresticker (1): stmmac: Add an optional register interface clock Andrew Lunn (14): net: dsa: mv88e6352: Refactor shareable code net: dsa: mv88e6171: Enable access to phys via internal mdio bus net: dsa: Centralise getting switch id net: dsa: mv88e6171: Add defines for switch product IDs net: dsa: mv88e6171: Add EEE support to the mv88e6172 net: dsa: mv88e6171: Add support for hardware bridging net: dsa: Consistently set and use ps->num_ports net: dsa: Centralize Marvell switch reset net: dsa: Move phy page access functions into shared code net: dsa: Consolidate phy read and write functions net: dsa: mv88e6xxx: Add missing mutex's in EEE operations. net: dsa: Consolidate getting the statistics net: dsa: Use mnemonics rather than register numbers net: dsa: mv88e6xxx: Fix stats counters for 6352 family Andrew Schwartzmeyer (1): hyperv: Implement netvsc_get_channels() ethool op Anjali Singhai (1): i40e: Ioremap changes Anjali Singhai Jain (15): i40e/i40evf: i40e_register.h updates i40e: Fix the EMPR interrupt received handling i40e: Enable more than 64 qps for the Main VSI i40e: Add FW check to disable DCB and wrap autoneg workaround with FW check i40e/i40evf: Add missing packet types for VXLAN encapsulated packet types i40e: Move RSS table size for VSIs to the VSI struct i40e: Fix RSS size at init since default num queue calculation has changed i40e: Avoid logs while adding/deleting FD-SB filters i40e: FD filters flush policy changes i40e/i40evf: Simplify tunnel selection logic i40e: Simplify code for rss_size_max config i40evf: Fix Outer UDP RX checksum code i40e: Print some more info to help figure out the cause of HMC error i40e: Communicate VSI id in place of VSI index to the VFs i40evf: Refactor VF RSS code Anton Blanchard (1): netfilter: Don't hide NETFILTER_XT_MATCH_ADDRTYPE behind NETFILTER_ADVANCED Arend van Spriel (15): brcmfmac: use helper function for changing SDIO state brcmfmac: add debugfs file containing revision info brcmfmac: make sdio suspend wait for threads to freeze brcmfmac: remove duplication of ramsize info brcmfmac: always perform cores checks brcmfmac: rename chip download functions brcmfmac: assure device is ready for download after brcmf_chip_attach() brcmfmac: extract ram size info from internal memory registers brcmfmac: take save&restore memory into account for SDIO shared info brcmfmac: fix watchdog timer regression brcmfmac: avoid runtime-pm for sdio host controller brcmfmac: add MODULE_FIRMWARE() macros for bcm4356 PCIe device brcmfmac: add support for BCM43430 SDIO chipset brcmfmac: only support the BCM43455/7 device brcmfmac: remove support for unreleased BCM4354 PCIe Arik Nemtsov (21): iwlwifi: mvm: consider TDLS queues as used during drain mac80211: TDLS: support VHT between peers mac80211: allow TDLS setup code to take wdev lock mac80211: allow iterating inactive interfaces iwlwifi: mvm: add MCC update FW API iwlwifi: mvm: init country code on init/recovery iwlwifi: create regdomain from mcc_update_cmd response iwlwifi: mvm: consider LAR support during NVM parse iwlwifi: ignore IBSS flag as regulatory NO-IR indication iwlwifi: mvm: LAR: Add chub mcc change notify command iwlwifi: nvm: init correct nvm channel list for 8000 devices iwlwifi: allow disabling LAR via module param iwlwifi: use correct NVM offset for LAR enable for new NVMs iwlwifi: mvm: reflect TDLS pm state in mvmvif->pm_enabled iwlwifi: don't allow the FW to return invalid ch indices iwlwifi: mvm: don't init MCC during CT-kill iwlwifi: mvm: assign new TLV bit for multi-source LAR iwlwifi: mvm: remove d0i3 ref correctly during AP start cfg/mac80211: add regulatory classes IE during TDLS setup mac80211: send HT/VHT IEs in TDLS discovery response iwlwifi: mvm: always reconfigure last MCC on init Arman Uguray (18): Bluetooth: Add definitions for Add/Remove Advertising API Bluetooth: Introduce HCI_ADVERTISING_INSTANCE setting and add AD flags Bluetooth: Add data structure for advertising instance Bluetooth: Implement the Add Advertising command Bluetooth: Implement the Remove Advertising command Bluetooth: Add support for instance scan response Bluetooth: Add support for adv instance timeout Bluetooth: Add macros for advertising instance flags Bluetooth: Support the "connectable mode" adv flag Bluetooth: Support the "discoverable" adv flag Bluetooth: Support the "limited-discoverable" adv flag Bluetooth: Support the "managed-flags" adv flag Bluetooth: Support the "tx-power" adv flag Bluetooth: Update supported_flags for AD features Bluetooth: Unify advertising data code paths Bluetooth: Fix using global connectable settings for adv Bluetooth: Use ADV_SCAN_IND for adv. instances Bluetooth: Update adv. parameters when conn. setting changes Arturo Borrero (1): netfilter: nft_compat: add support for arptables extensions Arun Chandran (3): net: macb: Add big endian CPU support net: macb: Add on the fly CPU endianness detection net: macb: Properly add DMACFG bit definitions Ashish Shah (1): i40evf: allow enabling of debug prints via ethtool Avinash Patil (11): mwifiex: use alloc_workqueue's format strings capabilities for WQ names mwifiex: do not process mgmt rx on uninitialized interface mwifiex: change datatype to bool for device capability flags mwifiex: modify TX buff size for SD8887 mwifiex: DMA alignment for RX packets mwifiex: do not initialize ext_scan in mwifiex_init_adapter mwifiex: lock main process till reinitialization of vif is over mwifiex: rename alloc_rx_buf to alloc_dma_aligned_buf mwifiex: enhance SD8897 MP aggregation limits mwifiex: fix crash in SDIO RX path mwifiex: stop command path in suspend handler Bas Peters (1): libertas: remove unnecessary check before calling debugfs_remove Ben (1): cfg80211: Process all pending regulatory requests/hints Ben Dooks (1): can: at91_can: use endian agnostic IO accessors Ben Greear (4): ath10k: scan should handle scan-start-failed event properly ath10k: fix spelling mistakes and add details to mac logging ath10k: fix spelling in htt code comment ath10k: fix CE_DESC_FLAGS_META_DATA_LSB definition Ben Hutchings (16): pktgen: Delete the original date from documentation pktgen: Fix grammar errors and some poor wording in documentation samples/pktgen: Add sample scripts for pktgen facility samples/pktgen: Delete unused function pg() samples/pktgen: Correct comments about the thread config samples/pktgen: Remove setting of obsolete max_before_softirq parameter samples/pktgen: Use bash as interpreter samples/pktgen: Trap SIGINT samples/pktgen: Show the results rather than just commenting where they are pktgen: Correct documentation of module name and command usbnet: Fix tx_packets stat for FLAG_MULTI_FRAME drivers sh_eth: Implement multicast statistic based on the RFS8 status bit sh_eth: WARN on access to a register not implemented in a particular chip sh_eth: Implement ethtool register dump operations sh_eth: Optionally log RX and TX status for each completed descriptor sh_eth: Mitigate lost statistics updates Beshay, Joseph (1): netem: Fixes byte backlog accounting for the first of two chained netem instances Bob Copeland (1): mac80211_hwsim: support any address in userspace Bojan Prtvar (1): net: Remove state argument from skb_find_text() Boris BREZILLON (3): ARM: at91/dt: fix macb compatible strings net: macb: remove #if defined(CONFIG_ARCH_AT91) sections net/macb: Update DT bindings documentation Boris Sorochkin (1): wil6210: Fix division by zero in wil_vring_debugfs_show Brad Campbell (2): cc2520: Do not store platform_data in spi_device cc2520: Add support for CC2591 amplifier. Carolyn Wyborny (2): i40e: Add method to keep track of current rxnfc settings i40evf: Add more info to interrupt vector names Catherine Sullivan (8): i40e/i40evf: Remove unused variable an_enable and function update_link_info i40e/i40evf: Use advertised speed settings in ethtool and refactor get_settings i40e: Reassign incorrect PHY type to fix a FW bug i40e: Add AOC PHY types to case statements i40e: Remove duplicate code i40e/i40evf: Bump i40e/i40evf version i40e: Bump version to 1.2.43 i40e: Bump to version 1.3.1 Cathy Luo (1): mwifiex: fix a bug in Rx multiport aggregation logic Cedric Izoard (1): mac80211: Get IV len from key conf and not cipher scheme Chen Gang (1): bcma: Kconfig: Let it depend on PCI Christophe Ricard (10): NFC: st21nfcb: Fix memory leak in secure element probing stage NFC: st21nfcb: Retry i2c_master_send if it returns a negative value NFC: st21nfca: fix st21nfca_get_iso14443_3_uid data copy NFC: st21nfca: Change st21nfca_get_iso14443_3_uid parameter name nfc: hci: Add comment to explain NFC_HCI_MAX_PIPES nfc: Reduce nfc_evt_transaction params length to 0 nfc: st21nfcb: Add missing break statement in switch section nfc: nci: Add comment to explain NCI_HCI_MAX_PIPES nfc: st21nfcb: Add additional comments about EVT_TRANSACTION nfc: st21nfca: Add additional comments about EVT_TRANSACTION Claudiu Manoil (2): gianfar: Make BDs access endian safe gianfar: Make FCB access endian safe Clément Perrochaud (3): NFC: nci: Add firmware download support NFC: nxp-nci: Add support for NXP NCI chips NFC: nxp-nci_i2c: Add I2C support to NXP NCI driver Colin Ian King (1): wil6210: increase cmd buffer size to avoid sscanf buffer overflow Cong Wang (1): net_sched: destroy proto tp when all filters are gone Cyrille Pitchen (2): net/macb: unify clock management net/macb: merge at91_ether driver into macb driver Dan Carpenter (6): ethtool: use "ops" name consistenty in ethtool_set_rxfh() rtlwifi: rtl8188ee: missing curly braces in handle_branch1() ax25: remove unneeded NULL test in ax_xmit() mwifiex: missing curly braces in mwifiex_write_data_complete() mwifiex: remove an unneede NULL check in mwifiex_init_adapter() mac80111: aes_ccm: cleanup ieee80211_aes_key_setup_encrypt() Daniel Axtens (1): toshiba: Remove celleb from Kconfig options Daniel Borkmann (24): ebpf: remove kernel test stubs ebpf: constify various function pointer structs ebpf: export BPF_PSEUDO_MAP_FD to uapi ebpf: make internal bpf API independent of CONFIG_BPF_SYSCALL ifdefs ebpf: remove CONFIG_BPF_SYSCALL ifdefs in socket filter code ebpf: add sched_cls_type and map it to sk_filter's verifier ops ebpf: move read-only fields to bpf_prog and shrink bpf_prog_aux cls_bpf: add initial eBPF support for programmable classifiers filter: refactor common filter attach code into __sk_attach_prog ebpf: move CONFIG_BPF_SYSCALL-only function declarations ebpf: bpf_map_*: fix linker error on avr32 and openrisc arch ebpf: verifier: check that call reg with ARG_ANYTHING is initialized cls_bpf: do eBPF invocation under non-bh RCU lock variant for maps rhashtable: kill ht->shift atomic operations ebpf: add prandom helper for packet sampling ebpf: add helper for obtaining current processor id ebpf, filter: do not convert skb->protocol to host endianess during runtime ebpf: add sched_act_type and map it to sk_filter's verifier ops act_bpf: add initial eBPF support for actions tools: bpf_asm: cleanup vlan extension related token netfilter: x_tables: fix cgroup matching on non-full sks ebpf: add skb->priority to offset map for usage in {cls, act}_bpf netfilter: x_tables: don't extract flow keys on early demuxed sks in socket match net: use jump label patching for ingress qdisc in __netif_receive_skb_core Daniel Drake (1): Bluetooth: btusb: Add helper for READ_LOCAL_VERSION command Daniel Lee (2): tcp: RFC7413 option support for Fast Open server tcp: RFC7413 option support for Fast Open client David Ahern (2): net: add support for phys_port_name rocker: add support for phys_port_name David Ertman (1): e1000e: initial support for i219 David Howells (5): RxRPC: Fix the conversion to iov_iter RxRPC: Don't call skb_add_data() if there's no data to copy RxRPC: Use iov_iter_count() in rxrpc_send_data() instead of the len argument AFS: afs_send_empty_reply() doesn't require an iovec array RxRPC: Handle VERSION Rx protocol packets David L Stevens (1): sunvnet: failed trigger should not cause BUG_ON() David Miller (5): netfilter: Add nf_hook_state initializer function. netfilter: Add socket pointer to nf_hook_state. netfilter: Pass socket pointer down through okfn(). udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb(). netfilter: Fix switch statement warnings with recent gcc. David S. Miller (176): Revert "crypto: Fix regressions caused by iov_iter changes." Merge git://git.kernel.org/.../torvalds/linux Merge git://git.kernel.org/.../davem/net Merge branch 'r8152-next' Merge branch 'mv88e6171_indirect_phy' Merge branch 'be2net-next' Merge branch 'ppc_bpf' Merge branch 'bnx2x-next' Merge branch 'bna-next' Merge branch 'be2net-next' Merge branch 'pktgen-next' Merge branch 'bcmgenet-next' Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch 'bonding-next' Merge branch 'sf2_hwbridge' Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch 'rocker-next' Merge branch 'ip_level_multicast_join_leave' Merge branch 'fib_trie_remove_leaf_info' Merge branch 'tipc-next' Merge branch 'tcp-tso' Merge branch 's390-next' Merge branch 'ebpf_support_for_cls_bpf' Merge branch 'dropcount' Merge branch 'sendmsg_recvmsg_iocb_removal' Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge git://git.kernel.org/.../pablo/nf-next Merge branch 'neigh_cleanups' Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge git://git.kernel.org/.../davem/net Merge branch 'neigh-mpls-prep' Merge branch 'basic-mpls-support' Merge branch 'sh_eth-next' Merge branch 'be2net-next' Merge tag 'linux-can-next-for-4.1-20150304' of git://git.kernel.org/.../mkl/linux-can-next Merge branch 'fib_trie-next' Merge branch 'cxgb4-next' Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch 'dsa-next' Merge branch 'l3_hw_offload' ipv4: Fix unused variable warnings in fib_table_flush_external. Merge branch 'pmtu-probe' Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch 'bcmgenet-next' Merge tag 'wireless-drivers-next-for-davem-2015-03-06' of git://git.kernel.org/.../kvalo/wireless-drivers-next Merge branch 'fib_trie-next' Merge branch 'mlx4-qcn' Merge branch 'macb-next' Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch 'mpls-next' Merge tag 'iwlwifi-next-for-kalle-2015-03-07' of https://git.kernel.org/.../iwlwifi/iwlwifi-next Merge git://git.kernel.org/.../pablo/nf-next Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge git://git.kernel.org/.../davem/net Merge branch 'dsa-next' Merge git://git.kernel.org/.../pablo/nf-next Merge branch 'inet_diag_cleanups' Merge branch 'dsa_phy_divert' Merge branch 'rhashtable-cleanups' Merge branch 'possible_net_t' Merge branch 'fib_trie_table_merge_fixes' Merge branch 'listener_refactor' Merge branch 'tcp_metrics_netns_debloat' Merge branch 'bcmgenet_xmit_more' Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'tipc-next' Merge branch 'listener_refactor_part_9' Merge branch 'master' of git://git.kernel.org/.../jkirsher/next-queue Merge branch 'rhashtable-next' Merge branch 'gianfar-next' Merge branch 'ebpf_helpers' Merge branch 'ebpf_skb_fields' Merge branch 'rhashtable-fixes-next' Merge branch 'swdev_ops' Merge branch 'listener_refactor' Merge branch 'const_of_device_id' Merge branch 'listener_refactor_part_11' Merge branch 'listener_refactor_part_12' Merge branch 'tipc_netns_leak' Merge branch 'xgene-next' Merge branch 'rhashtable_remove_shift' Merge branch 'txq_max_rate' Merge branch 'listen_refactor_part_13' net: Fix high overhead of vlan sub-device teardown. Merge branch 'tipc-next' Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'cxgb4-next' Merge branch 'listener_refactor_part_14' Merge branch 'rhashtable-inlined-interface' Merge branch 'amd-xgbe-next' Merge git://git.kernel.org/.../davem/net Merge branch 'ebpf-next' Merge branch 'master' of git://git.kernel.org/.../jkirsher/next-queue Merge branch 'netcp-next' Merge branch 'crypto_async' Merge branch 'gigaset_modem_response' Merge branch 'listener_refactor_part_15' Merge git://git.kernel.org/.../pablo/nf-next Merge tag 'linux-can-next-for-4.1-20150323' of git://git.kernel.org/.../mkl/linux-can-next Merge branch 'rhashtable-next' Merge branch 'bcmgenet-next' Merge branch 'ipv6_stable_privacy_address' Merge git://git.kernel.org/.../davem/net Merge branch 'cxgb4-fcoe' Merge branch 'rhashtable-next' Merge branch 'listener_refactor_16' Merge branch 'tipc-next' Merge branch 'xgene-next' Merge branch 'bcmgenet-next' Merge branch 'be2net-next' Merge branch 'tipc-next' Merge git://git.kernel.org/.../pablo/nf-next Merge branch 'dsa-hw-bridging' Merge branch 'stacked_vlan_tso' Merge branch 'master' of git://git.kernel.org/.../jkirsher/next-queue Merge branch 'ptp-2038' Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'bnx2x-next' Merge branch 'ipv6_null' Merge branch 'nla_in_addr' Merge branch 'hv_netvsc-next' Merge branch 'bcmgenet-next' Merge branch 'mlx4-next' Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/.../jberg/mac80211-next Merge branch 'macb-next' Merge branch 'ptp-ns_to_timespec64' Merge tag 'linux-can-next-for-4.1-20150401' of git://git.kernel.org/.../mkl/linux-can-next Merge tag 'wireless-drivers-next-for-davem-2015-04-01' of git://git.kernel.org/.../kvalo/wireless-drivers-next Merge branch 'dsa-next' Merge branch 'netdev_iflink_remove' Merge git://git.kernel.org/.../davem/net Merge branch 'mlx4-next' Merge branch 'tipc-next' Merge branch 'mlx5-next' Merge branch 'ipv4-null-cmp' Merge branch 'master' of git://git.kernel.org/.../jkirsher/next-queue Merge branch 'mvneta-sgmii' netfilter: Create and use nf_hook_state. netfilter: Use nf_hook_state in nf_queue_entry. netfilter: Make nf_hookfn use nf_hook_state. netfilter: Pass nf_hook_state through nf_nat_ipv4_{in,out,fn,local_fn}(). netfilter: Pass nf_hook_state through ipt_do_table(). netfilter: Pass nf_hook_state through nf_nat_ipv6_{in,out,fn,local_fn}(). netfilter: Pass nf_hook_state through ip6t_do_table(). netfilter: Pass nf_hook_state through nft_set_pktinfo*(). netfilter: Pass nf_hook_state through arpt_do_table(). Merge branch 'nf-hook-compress' Merge git://git.kernel.org/.../davem/net Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'udp_tunnel_sk' Merge branch 'netns-next' Merge branch 'dma_rmb_wmb' Merge branch 'sfc-next' Merge branch 'hv_netvsc_linearize' Merge branch 'rds' Merge branch 'selinux-nlmsg' sfc: Revert SRIOV changes. Merge tag 'nfc-next-4.1-1' of git://git.kernel.org/.../sameo/nfc-next Merge branch 'dma_rmb_wmb' Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec-next Merge tag 'wireless-drivers-next-for-davem-2015-04-09' of git://git.kernel.org/.../kvalo/wireless-drivers-next Merge git://git.kernel.org/.../pablo/nf-next Merge branch 'xgbe-next' Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'master' of git://git.kernel.org/.../jkirsher/next-queue Merge tag 'mac80211-next-for-davem-2015-04-10' of git://git.kernel.org/.../jberg/mac80211-next Merge branch 'selinux_xfrm_nl_cmd' Merge branch 'fou-next' Merge branch 'master' of git://git.kernel.org/.../jkirsher/next-queue Merge branch 'netdev_diet' Merge branch 'for-davem' of git://git.kernel.org/.../viro/vfs Merge branch 'cxgb4-next' Merge git://git.kernel.org/.../davem/net Merge git://git.kernel.org/.../pablo/nf-next Merge branch 'master' of git://git.kernel.org/.../jkirsher/next-queue David Spinadel (4): iwlwifi: mvm: use only 40 ms for fragmented scan iwlwifi: mvm: don't override passive dwell in case of fragmented scan iwlwifi: mvm: inform mac80211 about umac scans that was aborted by restart mac80211: stop scan before connection Dedy Lansky (1): cfg80211: add bss_type and privacy arguments in cfg80211_get_bss() Denis Kirjanov (6): ppc: bpf: add required compatibility macros for jit ppc: bpf: add reqired opcodes for ppc32 ppc: bpf: update jit to use compatibility macros ppc: bpf: rename bpf_jit_64.S to bpf_jit_asm.S ppc: bpf: Add SKF_AD_CPU for ppc32 ppc: Kconfig: Enable BPF JIT on ppc32 Dinh Nguyen (1): net: stmmac: make reset control an optional requirement Don Skidmore (6): ixgbe: add new wrapper for X550 support ixgbe: Clean up type inconsistency ixgbe: cleanup make ixgbe_set_ethertype_anti_spoofing_X550 static ixgbe: Move bridge mode from flag to variable ixgbe: add new bridge mode support function. ixgbe: add support for X550 source_address_prunning Eli Cohen (5): net/mlx5_core: Allocate firmware pages from device's NUMA node net/mlx5_core: Coding style fix net/mlx5_core: Avoid setting DC requestor/responder resources net/mlx5_core: Use coherent memory for command interface page net/mlx5_core: Avoid copying outbox in aysnc command completion Eliad Peller (6): cfg80211: add operating classes 128-130 iwlwifi: don't declare support for 5ghz if not supported iwlwifi: use IWL_DEFAULT_MAX_TX_POWER for max_eirp iwlwifi: disable 11ac if 11n is disabled iwlwifi: mvm: take IWL_MVM_REF_UCODE_DOWN before restarting hw iwlwifi: pcie: initialize trans_pcie->ref_count on configure() Eliezer Tamir (3): e1000: call netif_carrier_off early on down ixgb: call netif_carrier_off early on down e1000e: call netif_carrier_off early on down Emmanuel Grumbach (43): iwlwifi: pcie: apply destination before releasing reset iwlwifi: mvm: new Alive / error table API iwlwifi: add new TLV capability flag for BT PLCR iwlwifi: mvm: allow to force the Rx chains from debugfs iwlwifi: mvm: add framework for triggers for fw dump iwlwifi: mvm: add the cause of the firmware dump in the dump iwlwifi: mvm: add trigger for firmware dump upon missed beacons iwlwifi: mvm: add trigger for firmware dump upon channel switch iwlwifi: mvm: add trigger for firmware dump upon command response iwlwifi: mvm: restart firmware recording when no configuration is set iwlwifi: mvm: add trigger for firmware dump upon statistics iwlwifi: mvm: add trigger for firmware dump upon low RSSI iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set iwlwifi: fix max_ht_ampdu_exponent for older devices iwlwifi: bump API to 13 for devices that use iwlmvm iwlwifi: mvm: remove IWL_UCODE_TLV_API_DISABLE_STA_TX iwlwifi: mvm: remove IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF iwlwifi: mvm: BT Coex - disable RRC by default iwlwifi: mvm: always update the quota after association iwlwifi: pcie: speed up the Tx DMA stop flow iwlwifi: pcie: include more registers in the prph dump iwlwifi: fix smatch warning: warn: inconsistent indenting iwlwifi: mvm: remove unneeded include iwl-fw-error-dump.h iwlwifi: mvm: fix identation iwlwifi: pcie: allow the op_mode to freeze the stuck queue timer iwlwifi: mvm: freeze the non-shared queues when a station goes to sleep iwlwifi: mvm: fix force NMI for 8000 iwlwifi: mvm: BT Coex - update the new API iwlwifi: update copyright to include 2015 Merge branch 'iwlwifi-fixes' into iwlwifi-next mac80211: allow to get wireless_dev structure from ieee80211_vif iwlwifi: mvm: properly flush the queues for buffering transport iwlwifi: drop support for early versions of 8000 iwlwifi: mvm: allow to configure the timeout for the Tx queues mac80211: convert rssi_callback() to event_callback() mac80211: notify the driver about authentication status mac80211: notify the driver about association status mac80211: notify the driver about deauth iwlwifi: check the size of the trigger struct from the firmware file Merge tag 'mac80211-next-for-davem-2015-03-30' into iwlwifi-next iwlwifi: mvm: add trigger for firmware dump upon MLME failures iwlwifi: mvm: add trigger for time events iwlwifi: mvm: capture connection loss as part of MLME trigger Eran Ben Elisha (6): net/mlx4_en: Fix port counters statistics bitmask net/mlx4_en: Create new header file for all statistics info net/mlx4_en: Move statistics bitmap setting to the Ethernet driver net/mlx4_en: Support general selective view of ethtool statistics net/mlx4_en: Protect access to the statistics bitmap net/mlx4_en: Moderate ethtool callback to show more statistics Eran Harary (10): iwlwifi: mvm: increase the number of PAPD channel groups to 9 iwlwifi: mvm: don't write to DBGC_OUT_CTRL when stopping the recording iwlwifi: mvm: support new PHY_SKU nvm section for family 8000 B0 iwlwifi: mvm: take the MAC address from HW registers iwlwifi: mvm: support family 8000 B2/C steps iwlwifi: trans: Take ownership on secure machine before FW load iwlwifi: mvm: Always enable the smart FIFO iwlwifi: mvm: don't wait for firmware verification iwlwifi: mvm: fix debug print in the RSA ownership workaround iwlwifi: 8000: change PNVM in case it doesn't match to the HW step Eric Dumazet (73): igmp: add __ip_mc_{join|leave}_group() tcp: tso: remove tp->tso_deferred tcp: tso: restore IW10 after TSO autosizing tcp: tso: allow CA_CWR state in tcp_tso_should_defer() tcp: cleanup static functions inet_diag: remove duplicate code from inet_twsk_diag_dump() tg3: use napi_complete_done() net: gro: remove obsolete code from skb_gro_receive() net: constify sock_diag_check_cookie() inet_diag: cleanups inet_diag: add const to inet_diag_req_v2 net: add real socket cookies net: fix CONFIG_NET_NS=n compilation ipv6: add missing ireq_net & ir_cookie initializations inet: add TCP_NEW_SYN_RECV state inet: add ireq_state field to inet_request_sock inet: add rsk_refcnt/ireq_refcnt to request socks net: add req_prot_cleanup() & req_prot_init() helpers inet: prepare sock_edemux() & sock_gen_put() for new SYN_RECV state inet: get_openreq4() & get_openreq6() do not need listener inet: introduce ireq_family inet: fill request sock ir_iif for IPv4 inet_diag: adjust inet_sk_diag_fill() bug condition inet_diag: factorize code in new inet_diag_msg_common_fill() helper net: add sk_fullsock() helper inet: ip early demux should avoid request sockets inet_diag: allow sk_diag_fill() to handle request socks inet: factorize sock_edemux()/sock_gen_put() code inet: add proper refcounting to request sock tcp_metrics: fix wrong lockdep annotations netfilter: use sk_fullsock() helper netfilter: tproxy: prepare TCP_NEW_SYN_RECV support netfilter: xt_socket: prepare for TCP_NEW_SYN_RECV support inet: move ir_mark to fill a hole tcp: move tcp_openreq_init() to tcp_input.c tcp: uninline tcp_oow_rate_limited() inet: add sk_listener argument to inet_reqsk_alloc() inet: uninline inet_reqsk_alloc() inet: add rsk_listener field to struct request_sock tcp: rename struct tcp_request_sock listener inet: avoid fastopen lock for regular accept() inet: fix request sock refcounting netns: constify net_hash_mix() and various callers net: introduce sk_ehashfn() helper inet: add IPv6 support to sk_ehashfn() ipv6: get rid of __inet6_hash() inet: get rid of last __inet_hash_connect() argument inet: request sock should init IPv6/IPv4 addresses inet: add a schedule point in inet_twsk_purge() inet: drop prev pointer handling in request sock inet: get rid of central tcp/dccp listener timer net: increase sk_[max_]ack_backlog Revert "selinux: add a skb_owned_by() hook" inet: cache listen_sock_qlen() and read rskq_defer_accept once inet: remove sk_listener parameter from syn_ack_timeout() inet: remove some sk_listener dependencies net: convert syn_wait_lock to a spinlock ipv4: tcp: handle ICMP messages on TCP_NEW_SYN_RECV request sockets ipv6: tcp: handle ICMP messages on TCP_NEW_SYN_RECV request sockets ipv4: dccp: handle ICMP messages on DCCP_NEW_SYN_RECV request sockets ipv6: dccp: handle ICMP messages on DCCP_NEW_SYN_RECV request sockets tcp: md5: fix rcu lockdep splat tcp: use C99 initializers in new_state[] tcp: md5: input path is run under rcu protected sections tcp: md5: remove request sock argument of calc_md5_hash() tcp: md5: get rid of tcp_v[46]_reqsk_md5_lookup() tcp: fix ipv4 mapped request socks tcp: tcp_syn_flood_action() can be static tcp: do not rearm rsk_timer on FastOpen requests tcp: tcp_make_synack() should clear skb->tstamp tcp: md5: fix a typo in tcp_v4_md5_lookup() tcp: do not cache align timewait sockets tcp/dccp: get rid of central timewait timer Eric W. Biederman (42): ax25: In ax25_rebuild_header add missing kfree_skb rose: Set the destination address in rose_header rose: Transmit packets in rose_xmit not rose_rebuild_header ax25/kiss: Replace ax_header_ops with ax25_header_ops ax25/6pack: Replace sp_header_ops with ax25_header_ops ax25: Make ax25_header and ax25_rebuild_header static ax25: Refactor to use private neighbour operations. arp: Remove special case to give AX25 it's open arp operations. neigh: Move neigh_compat_output into ax25_ip.c ax25: Stop calling/abusing dev_rebuild_header ax25: Stop depending on arp_find net: Kill dev_rebuild_header arp: Kill arp_find neigh: Don't require dst in neigh_hh_init neigh: Don't require a dst in neigh_resolve_output ax25: Stop using magic neighbour cache operations. neigh: Factor out ___neigh_lookup_noref neigh: Add helper function neigh_xmit mpls: Refactor how the mpls module is built mpls: Basic routing support mpls: Add a sysctl to control the size of the mpls label table mpls: Basic support for adding and removing routes mpls: Functions for reading and wrinting mpls labels over netlink mpls: Netlink commands to add, remove, and dump routes mpls: Multicast route table change notifications DECnet: Only use neigh_ops for adding the link layer header mpls: Fix the kzalloc argument order in mpls_rt_alloc mpls: Cleanup the rcu usage in the code. mpls: Better error code for unsupported option. mpls: Correct the ttl decrement. mpls: Fix the openvswitch select of NET_MPLS_GSO neigh: Use neigh table index for neigh_packet_xmit net: Remove protocol from struct dst_ops net: Kill hold_net release_net net: Introduce possible_net_t mpls: In mpls_egress verify the packet length. tcp_metrics: panic when tcp_metrics_init fails. tcp_metrics: Mix the network namespace into the hash function. tcp_metrics: Add a field tcpm_net and verify it matches on lookup tcp_metrics: Remove the unused return code from tcp_metrics_flush_all tcp_metrics: Rewrite tcp_metrics_flush_all tcp_metrics: Use a single hash table for all network namespaces. Erik Hugne (12): tipc: only create header copy for name distr messages tipc: fix nullpointer bug when subscribing to events tipc: purge links when bearer is disabled tipc: rename media/msg related definitions tipc: make media address offset a common define tipc: increase size of tipc discovery messages tipc: add ip/udp media type tipc: sparse: fix htons conversion warnings tipc: fix inconsistent signal handling regression tipc: remove redundant call to tipc_node_remove_conn tipc: do not report -EHOSTUNREACH for failed local delivery tipc: add support for connect() on dgram/rdm sockets Eyal Birger (7): net: bluetooth: compact struct bt_skb_cb by inlining struct hci_req_ctrl net: bluetooth: compact struct bt_skb_cb by converting boolean fields to bit fields net: rxrpc: change call to sock_recv_ts_and_drops() on rxrpc recvmsg to sock_recv_timestamp() net: packet: use sockaddr_ll fields as storage for skb original length in recvmsg path net: use common macro for assering skb->cb[] available size in protocol families net: add common accessor for setting dropcount on packets net: move skb->dropcount to skb->cb[] Eyal Shapira (11): iwlwifi: mvm: rs: better match tx response rate to the LQ table iwlwifi: mvm: rs: fix BT Coex check to look at the correct ant iwlwifi: mvm: rs: adapt rate matching to new STBC/BFER iwlwifi: mvm: rs: disable MIMO for low latency P2P iwlwifi: mvm: rs: avoid ss_force from being reset after tx idle iwlwifi: mvm: rs: print single stream params via debugfs iwlwifi: mvm: fix BT coex shared antenna activity check iwlwifi: mvm: remove unused function in BT coex iwlwifi: mvm: rs: improve ss_params debug print iwlwifi: mvm: rs: update Tx statistics when using fixed rate iwlwifi: mvm: rs: refactor rs_update_rate_tbl Fabian Frederick (17): net/atm/signaling.c: remove WAIT_FOR_DEMON code net: netcp: constify of_device_id array Altera TSE: constify of_device_id array net/fsl: constify of_device_id array net: ethoc: constify of_device_id array drivers: net: xgene: constify of_device_id array net: ethernet: apple: constify of_device_id array netdev: octeon_mgmt: constify of_device_id array net: greth: constify of_device_id array net: xilinx: constify of_device_id array orinoco: constify of_device_id array net: phy: constify of_device_id array can: constify of_device_id array IBM-EMAC: constify of_device_id array ehea: constify of_device_id array net: via-rhine: constify of_device_id array via-velocity: constify of_device_id array Fabio Estevam (1): net: smc91x: Remove an unused variable Fan Du (6): xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host ipv4: Raise tcp PMTU probe mss base size ipv4: Use binary search to choose tcp PMTU probe_size ipv4: Create probe timer for tcp PMTU as per RFC4821 ipv4: Documenting two sysctls for tcp PMTU probe inet: fix double request socket freeing Felix Fietkau (14): mac80211: minstrel_ht: fix rounding issue in MCS duration calculation bgmac: fix descriptor frame start/end definitions bgmac: implement GRO and use build_skb bgmac: implement scatter/gather support mac80211: add an intermediate software queue implementation bgmac: simplify tx ring index handling bgmac: leave interrupts disabled as long as there is work to do bgmac: set received skb headroom to NET_SKB_PAD bgmac: simplify/optimize rx DMA error handling bgmac: add check for oversized packets bgmac: increase rx ring size from 511 to 512 bgmac: simplify dma init/cleanup bgmac: fix DMA rx corruption bgmac: drop ring->num_slots Florian Fainelli (23): net: dsa: integrate with SWITCHDEV for HW bridging net: dsa: bcm_sf2: add HW bridging support net: dsa: update dsa_of_{probe, remove} to use a device pointer net: dsa: allow deferred probing net: dsa: split dsa_switch_setup into two functions net: dsa: let switches specify their tagging protocol net: dsa: extract dsa switch tree setup and removal net: core: add of_find_net_device_by_node() net: dsa: utilize of_find_net_device_by_node net: phy: bcm7xxx: add alternate id for 7439 of: mdio: export of_mdio_parse_addr net: dsa: move PHY setup on DSA MII bus to its own function net: dsa: fully divert PHY reads/writes if requested net: bcmgenet: update ring producer index and buffer count in xmit net: bcmgenet: add support for xmit_more net: dsa: do not use slave MII bus for fixed PHYs net: bcmgenet: propagate errors from bcmgenet_power_down net: bcmgenet: update bcmgenet_ephy_power_up to clear CK25_DIS bit net: bcmgenet: rename bcmgenet_ephy_power_up net: bcmgenet: fix GPHY power-up sequence net: bcmgenet: implement GPHY power down sequence net: bcmgenet: power up and down integrated GPHY when unused net: bcmgenet: power down and up GPHY during suspend/resume Florian Westphal (20): netfilter: reject: don't send icmp error if csum is invalid netfilter: bridge: rework reject handling bridge: move mac header copying into br_netfilter netfilter: bridge: move nf_bridge_update_protocol to where its used netfilter: bridge: refactor conditional in br_nf_dev_queue_xmit netfilter: fix sparse warnings in reject handling drivers: atm: nicstar: remove ifdef'd out skb destructors ar5523: use container_of ath9k: make ath_frame_info fit into reduced-size rate_driver_data netfilter: bridge: query conntrack about skb dnat netfilter: bridge: remove BRNF_STATE_BRIDGED flag netfilter: bridge: kill nf_bridge_pad can: use sock_efree instead of own destructor netfilter: bridge: really save frag_max_size between PRE and POST_ROUTING netfilter: bridge: don't use nf_bridge_info data to store mac header netfilter: bridge: add helpers for fetching physin/outdev netfilter: physdev: use helpers netfilter: bridge: add and use nf_bridge_info_get helper netfilter: bridge: start splitting mask into public/private chunks netfilter: bridge: make BRNF_PKT_TYPE flag a bool Fred Chou (1): ath9k_htc: check seq number instead of cmd id for timeout Geert Uytterhoeven (2): iwlegacy: 4965-rs: Remove bogus colon after newline from debug message mpls: Spelling: s/conceved/conceived/, s/as/a/ Gerhard Uttenthaler (1): can: ems_usb: fix endianess of CAN ID Greg Rose (10): i40e: Fix i40e_ndo_set_vf_spoofchk i40e: Add NPAR BW get and set functions i40e: Implement configfs for NPAR BW configuration i40e: Use ethtool private flags to display NPAR status i40e: Fix dependencies in the i40e driver on configfs i40e: Fix NPAR Tx Scheduler init i40e: Fix ethtool offline test i40e: Strip configfs code i40e: Remove "hello world" strings from i40e driver i40e/i40evf: Set Ethernet protocol correctly when Tx VLAN offloads are disabled Grzegorz Kolodziejczyk (4): Bluetooth: bnep: Return err value while sending cmd is not understood Bluetooth: bnep: Add support for get bnep features via ioctl Bluetooth: bnep: Add support to extended headers of control frames Bluetooth: bnep: Handle BNEP connection setup request Guenter Roeck (21): net: dsa: Ensure that port array elements are initialized before being used net: dsa: Introduce dsa_is_port_initialized net: dsa: mv88e6xxx: Add EEE support net: dsa: mv88e6352: Add support for EEE net: dsa: Handle non-bridge master change net: dsa: mv88e6xxx: Factor out common initialization code net: dsa: mv88e6xxx: Provide function for common port initialization net: dsa: mv88e6xxx: Disable Message Port bit for CPU port net: dsa: mv88e6xxx: Split mv88e6xxx_reg_read and mv88e6xxx_reg_write net: dsa: mv88e6352: Use common port initialization code net: dsa: mv88e6123_61_65: Use common port configuration net: dsa: mv88e6171: Use common port configuration net: dsa: mv88e6xxx: Add Hardware bridging support net: dsa: mv88e6352: Add support for hardware bridging net: dsa: Add basic framework to support ndo_fdb functions net: dsa: mv88e6xxx: Add support for fdb_add, fdb_del, and fdb_getnext net: dsa: mv88e6352: Add support for ndo_fdb functions net: dsa: mv88e6131: Use common initialization functions net: dsa: mv88e6xxx: Move switch product IDs into common include file net: dsa: mv88e6131: Determine and use number of switch ports net: dsa: mv88e6123_61_65: Determine and use number of switch ports Haggai Abramonvsky (1): net/mlx5_core: Fix call to mlx5_core_qp_modify Haiyang Zhang (6): hv_netvsc: Implement batching in send buffer hv_netvsc: remove vmbus_are_subchannels_present() in rndis_filter_device_add() hv_netvsc: Clean up two unused variables hv_netvsc: Define a macro RNDIS_AND_PPI_SIZE hv_netvsc: Fix the packet free when it is in skb headroom hv_netvsc: Implement partial copy into send buffer Hannes Frederic Sowa (14): lib: EXPORT_SYMBOL sha_init ipv6: introduce secret_stable to ipv6_devconf ipv6: generation of stable privacy addresses for link-local and autoconf ipv6: introduce IFA_F_STABLE_PRIVACY flag ipv6: collapse state_lock and lock ipv6: do retries on stable privacy addresses ipv6: introduce idgen_delay and idgen_retries knobs ipv6: add documentation for stable_secret, idgen_delay and idgen_retries knobs net: remove never used forwarding_accel_ops pointer from net_device ipv6: fix sparse warnings in privacy stable addresses generation ipv4: hash net ptr into fragmentation bucket selection ipv6: hash net ptr into fragmentation bucket selection ipv4: ip_tunnel: use net namespace from rtable not socket ipv6: call iptunnel_xmit with NULL sock pointer if no tunnel sock is available Hante Meuleman (10): brcmfmac: Remove error print for invalid key index. brcmfmac: Dont sleep when ctrl frames to transmit. brcmfmac: Fix escan timer causing oops. brcmfmac: Fix oops when SDIO device is removed. brcmfmac: Simplify watchdog sleep. brcmfmac: Fix possible race-condition. brcmfmac: Fix race condition in msgbuf ioctl processing. brcmfmac: Add necessary memory barriers for SDIO. brcmfmac: Update msgbuf commonring size for improved throughput. brcmfmac: Remove unnecessary new-line in pcie console logging. Hariprasad Shenai (10): cxgb4: Move offload Rx queue allocation to separate function cxgb4: Try and provide an RDMA CIQ per cpu cxgb4: Add device ID for new adapter cxgb4/cxgb4vf/csiostor: Make PCI Device ID Tables be "const" cxgb4: Move ethtool related code to a separate file cxgb4: Increased the value of MAX_IMM_TX_PKT_LEN from 128 to 256 bytes cxgb4: Freelist starving threshold varies from adapter to adapter cxgb4: Use device node in page allocation cxgb4: Add comment for calculate tx flits and sge length code cxgb4: Don't call t4_slow_intr_handler when we're not the Master PF Herbert Xu (44): rhashtable: Move hash_rnd into bucket_table rhashtable: Add arbitrary rehash function rhashtable: Add annotation to nested lock rhashtable: Move masking back into key_hashfn rhashtable: Use head_hashfn instead of obj_raw_hashfn rhashtable: Remove key length argument to key_hashfn rhashtable: Remove obj_raw_hashfn rhashtable: Fix reader/rehash race rhashtable: Fix read-side crash during rehash rhashtable: Fix walker behaviour during rehash rhashtable: Use SINGLE_DEPTH_NESTING rhashtable: Move seed init into bucket_table_alloc rhashtable: Free bucket tables asynchronously after rehash rhashtable: Add rehash counter to bucket_table rhashtable: Move future_tbl into struct bucket_table rhashtable: Fix use-after-free in rhashtable_walk_stop rhashtable: Fix rhashtable_remove failures rhashtable: Remove shift from bucket_table rhashtable: Introduce max_size/min_size netlink: Use rhashtable max_size instead of max_shift tipc: Use rhashtable max/min_size instead of max/min_shift test_rhashtable: Use rhashtable max_size instead of max_shift rhashtable: Remove max_shift and min_shift rhashtable: Make rhashtable_init params argument const rhashtable: Allow hash/comparison functions to be inlined netlink: Move namespace into hash key netfilter: Convert nft_hash to inlined rhashtable test_rhashtable: Use inlined rhashtable interface tipc: Use inlined rhashtable interface rhashtable: Rip out obsolete out-of-line interface rhashtable: Fix undeclared EEXIST build error on ia64 netlink: Remove netlink_compare_arg.trailer rhashtable: Add barrier to ensure we see new tables in walker rhashtable: Eliminate unnecessary branch in rht_key_hashfn rhashtable: Allow hashfn to be unset netlink: Use default rhashtable hashfn tipc: Use default rhashtable hashfn rhashtable: Shrink to fit rhashtable: Add multiple rehash support rhashtable: Allow GFP_ATOMIC bucket table allocation rhashtable: Add immediate rehash during insertion rhashtable: Fix sleeping inside RCU critical section in walk_stop rhashtable: Add comment on choice of elasticity value test_rhashtable: Remove bogus max_size setting Hubert Sokolowski (1): net: Pass VLAN ID to rtnl_fdb_notify. Ian Morris (5): ipv6: remove dead debug code from ip6_tunnel.c ipv6: coding style: comparison for equality with NULL ipv6: coding style: comparison for inequality with NULL ipv4: coding style: comparison for equality with NULL ipv4: coding style: comparison for inequality with NULL Ido Shamay (15): net/mlx4: Add RSS support for fragmented IP datagrams net/mlx4_en: Change loopback only upon feature change net/mlx4: Make mlx4_is_eth visible inline funcion net/mlx4: Aesthetic code changes in multi_func_init net/mlx4: New file for QoS related firmware commands net/mlx4: Add mlx4_ALLOCATE_VPP implementation net/mlx4: Add mlx4_SET_VPORT_QOS implementation net/mlx4: Query device for QoS per VF support net/mlx4: Allocate VPPs for each port on PF init net/mlx4: Added qos_vport QP configuration in VST mode net/mlx4_en: Enable TX rate limit per VF net/mlx4: Warn users of depracated QoS Firmware net/mlx4: Set enhanced QoS support by default when ETS supported net/mlx4: Add SET_PORT opcode modifiers enumeration net/mlx4_en: Add interface identify support Ilan peer (4): cfg80211: Simplify the handling of regulatory indoor setting cfg80211: Add API to change the indoor regulatory setting cfg80211: Schedule timeout for all CRDA calls cfg80211: Stop calling crda if it is not responsive Ira Gusinsky (1): net/mlx5_core: Avoid usage command work entry after writing command doorbell Ivan Vecera (1): bnx2: disable toggling of rxvlan if necessary Iyappan Subramanian (3): Documentation: dts: xgene: Update interrupt field description dtb: xgene: Add interrupt for Tx completion drivers: net: xgene: Add separate tx completion ring Jaeden Amero (1): net/macb: Only adjust tx_clk on link change Jakub Pawlowski (10): Bluetooth: Move Service Discovery logic before refactoring Bluetooth: Refactor service discovery filter logic Bluetooth: fix service discovery behaviour for empty uuids filter Bluetooth: Introduce HCI_QUIRK_SIMULTANEOUS_DISCOVERY Bluetooth: Refactor BR/EDR inquiry and LE scan triggering. Bluetooth: Add simultaneous dual mode scan Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_ATH3012 Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_INTEL Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_CSR Bluetooth: Expose quirks through debugfs James Minor (1): cfg80211-wext: return -E2BIG when buffer can't hold full BSS entry Janusz.Dziedzic@tieto.com (4): cfg80211: add VHT support for IBSS mac80211: IBSS: refactor ieee80211_rx_bss_info mac80211: IBSS fix scan request mac80211: add VHT support for IBSS Jeff Kirsher (32): igbvf: Fix code comments and whitespace igbvf: cleanup msleep() and min/max() usage i40e: Fix mismatching type for ioremap_len i40e: Fix inconsistent use of PF/VF vs pf/vf ixgbe: enable relaxed ordering for SPARC ixgbevf: Fix code comments and whitespace ixgbevf: Use ether_addr_copy() instead of memcpy() fm10k: Corrected an error in Tx statistics fm10k: Remove redundant rx_errors in ethtool fm10k: Correct spelling mistake fm10k: Have the VF get the default VLAN during init fm10k: Add netconsole support fm10k: fix unused warnings fm10k: allow creation of VLAN on default vid fm10k: only show actual queues, not the maximum in hardware fm10k: use hw->mac.max_queues for stats fm10k: separate PF only stats so that VF does not display them fm10k: remove extraneous "Reset interface" message fm10k: only increment tx_timeout_count in Tx hang path fm10k: expose tx_timeout_count as an ethtool stat fm10k: Set PF queues to unlimited bandwidth during virtualization fm10k: use separate workqueue for fm10k driver fm10k: don't handle mailbox events in iov_event path and always process mailbox fm10k: comment next_vf_mbx flow fm10k: fix function header comment fm10k: start service timer on probe fm10k: update xcast mode before synchronizing multicast addresses fm10k: renamed mbx_tx_dropped to mbx_tx_oversized fm10k: reset head instead of calling update_max_size fm10k: mbx_update_max_size does not drop all oversized messages fm10k: corrected VF multicast update fm10k: Bump driver version to 0.15.2 Jeff Layton (1): rtl8188ee: fix build break due to missing rtl_hal_pwrseqcmdparsing definition Jes Sorensen (1): rtlwifi: Clear ACM_CTRL AC3_VO bit correctly Jesse Brandeburg (11): i40e: use more portable sign extension i40e: fix XPS mask when resetting i40e/i40evf: Clean up some formatting and other things i40e: store msg_enable in the right size i40e: clean up debug_read_register i40e/i40evf: enable prefetch of Tx descriptors during cleanup i40e/i40evf: fix accidental write to ITR registers i40e/i40evf: implement KR2 support i40e: Change some memcpys to struct assignments i40e/i40evf: fix bug when skb allocation fails i40e: fix invalid void return in FCoE code Jesse Gross (1): udptunnels: Call handle_offloads after inserting vlan tag. Jingchang Lu (1): gianfar: Consider dts property endianess on handling Jiri Benc (5): vxlan: fix indentation tcp: simplify inetpeer_addr_base use xfrm: simplify xfrm_address_t use netlink: implement nla_put_in_addr and nla_put_in6_addr netlink: implement nla_get_in_addr and nla_get_in6_addr Jiri Pirko (4): team: allow TSO being set on master switchdev: use gpl variant of symbol export dsa: change "select" to "depends on" for NET_SWITCHDEV and for NET_DSA net: rename dev to orig_dev in deliver_ptype_list_skb Jiri Slaby (1): Bluetooth: make hci_test_bit's addr const Joe Perches (23): batman-adv: Remove uses of return value of seq_printf batman-adv: Fix use of seq_has_overflowed() ethernet: Use eth__addr instead of memset net: usb: Use eth__addr instead of memset wireless: Use eth__addr instead of memset netconsole: Use eth__addr instead of memset xen: Use eth__addr instead of memset 8021q: Use eth__addr instead of memset appletalk: Use eth__addr instead of memset atm: Use eth__addr instead of memset bluetooth: Use eth__addr instead of memset ethernet: Use eth__addr instead of memset mac80211: Use eth__addr instead of memset wireless: Use eth__addr instead of memset l2tp: Use eth__addr instead of memset ethernet: codespell comment spelling fixes netfilter: Remove uses of seq_ return values netfilter: Use LOGLEVEL_ defines ethernet: Use bool function returns of true/false instead of 1/0 chelsio cxgb/cxgb3: Make stats_strings arrays const vxge: Add const to ethtool_driver_stats_keys NFC: logging neatening wireless: Use bool function returns of true/false instead of 1/0 Johan Hedberg (50): Bluetooth: btusb: Remove unneeded btusb_wait_on_bit_timeout() Bluetooth: Fix accepting early data on fixed channels Bluetooth: Fix AMP init for certain AMP controllers Bluetooth: Add new hci_cb entries to the tail rather than the head Bluetooth: Convert hci_cb_list_lock to a mutex Bluetooth: Convert L2CAP security callback to use hci_cb Bluetooth: Convert connect_cfm to be triggered through hci_cb Bluetooth: Convert disconn_cfm to be triggered through hci_cb Bluetooth: Remove bogus check for pending mgmt Set HS command Bluetooth: Fix checking for pending Set SSP in Set HS handler Bluetooth: Use hci_copy_identity_addr() helper for SMP chan creation Bluetooth: Rename hci_send_to_control to hci_send_to_channel Bluetooth: Remove unnecessary queue_monitor_skb() function Bluetooth: Update New CSRK event to match latest specification Bluetooth: Add mgmt HCI channel registration API Bluetooth: Convert mgmt to use HCI chan registration API Bluetooth: Move all mgmt command quirks to handler table Bluetooth: Rename cmd_status() to mgmt_cmd_status() Bluetooth: Rename cmd_complete() to mgmt_cmd_complete() Bluetooth: Rename pending_cmd to mgmt_pending_cmd Bluetooth: Add mgmt_send_event() helper to send to any HCI channel Bluetooth: Make Fast Connectable available while powered off Bluetooth: Add 'Already Paired' error for Pair Device command Bluetooth: Fix missing rcu_read_unlock() in hci_bdaddr_is_paired() Bluetooth: Check for matching IRK when looking for paired LE devices Bluetooth: Fix local OOB data handling for SMP Bluetooth: Track local vs remote OOB data availability Bluetooth: Set local OOB data flag if remote has our OOB data Bluetooth: Fix verifying confirm value when lacking remote OOB data Bluetooth: Don't send public key if OOB data verification fails Bluetooth: Add clarifying comment when setting local OOB flag Bluetooth: Add helper to get HCI channel of a socket Bluetooth: Add channel parameter to mgmt_pending_find() API Bluetooth: Add generic mgmt helper API Bluetooth: Add hdev_init callback for HCI channels Bluetooth: Move generic mgmt command dispatcher to hci_sock.c Bluetooth: Add workaround for broken OS X legacy SMP pairing Bluetooth: Fix memory leak in le_scan_disable_work_complete() Bluetooth: Fix race condition with HCI_RESET flag Bluetooth: Refactor L2CAP variables into l2cap_ctrl Bluetooth: Refactor HCI request variables into own struct Bluetooth: Add clarifying comment to command status handling Bluetooth: Add second hci_request callback option for full skb Bluetooth: Convert hci_req_sync family of function to new request API Bluetooth: Remove unneeded recv_event variable Bluetooth: Remove unused hci_req_pending() function Bluetooth: Move hci_get_cmd_complete() to hci_event.c Bluetooth: Convert local OOB data reading to use HCI request Bluetooth: Update SSP OOB data EIR definitions Bluetooth: Add local SSP OOB data to OOB ext data mgmt command Johannes Berg (44): mac80211: don't look up stations for multicast addresses mac80211: iterate using station list in AP SMPS cfg80211-wext: export symbols only when needed mac80211: remove TX latency measurement code wext: add checked wrappers for adding events/points to streams iwlwifi: mvm: add statistics API version 10 iwlwifi: mvm: support radio statistics as global survey iwlwifi: mvm: support beacon statistics for BSS client nl80211: add notes about userspace API/ABI modifications mac80211: fix another suspend vs. association race bridge: fix bridge netlink RCU usage mac80211: don't do driver suspend with auth/assoc in progress mac80211: start queues if driver rejected wowlan mac80211: check and dequeue skb in ieee80211_tx_prepare_skb() nl80211: prohibit mixing 'any' and regular wowlan triggers mac80211_hwsim: fix beacon timers iwlwifi: mvm: remove warning on station exhaustion iwlwifi: mvm: clarify time event end handling iwlwifi: mvm: simplify iwl_mvm_get_wakeup_status() return mac80211: move netdev stats to common function mac80211: add comment for rx_path_lock mac80211: refactor drop connection/unlock in CSA processing iwlwifi: mvm: continue (with error) CSA on GO time event failure iwlwifi: mvm: remove time-event start/end failure warning mac80211: remove drop_unencrypted code mac80211: don't look up destination station twice mac80211: drop 4-addr VLAN frames earlier if not connected mac80211: mesh: avoid pointless station lookup mac80211: avoid duplicate TX path station lookup cfg80211: add vlan to station add/change tracing mac80211: agg-tx: avoid sending DelBA with sta->lock held mac80211: reject aggregation sessions with non-HT peers mac80111: aes_gcm: clean up ieee80211_aes_gcm_key_setup_encrypt() mac80211: send AP probe as unicast again mac80211: make sta.wme indicate whether QoS is used mac80211: factor out station lookup from ieee80211_build_hdr() mac80211: set QoS capability before changing station state mac80211: use rhashtable for station table iwlwifi: mvm: remove unused arguments iwlwifi: mvm: don't return uninitialized value in get_survey() iwlwifi: mvm: do string formatting in debug triggers cfg80211: move IE split utilities here from mac80211 cfg80211: send extended capabilities IE in connect cfg80211: don't allow disabling WEXT if it's required John Fastabend (1): net: Add max rate tx queue attribute John Linville (1): mac80211: reduce log spam from ieee80211_handle_pwr_constr Jon Paul Maloy (16): tipc: Add Ying Xue to TIPC maintainers list tipc: ensure that idle links are deleted when a bearer is disabled tipc: add framework for node capabilities exchange tipc: move message validation function to msg.c tipc: eliminate unnecessary linearization of incoming buffers tipc: extract bundled buffers by cloning instead of copying tipc: eliminate unnecessary call to broadcast ack function tipc: split link outqueue tipc: clean up handling of message priorities tipc: introduce starvation free send algorithm tipc: clean up handling of link congestion tipc: eliminate race condition at dual link establishment tipc: fix two bugs in secondary destination lookup tipc: drop tunneled packet duplicates at reception tipc: eliminate delayed link deletion at link failover tipc: simplify link mtu negotiation Jonathan Doron (2): iwlwifi: mvm: support LAR updates from BIOS iwlwifi: mvm: set LAR MCC on D3/D0 transitions Jouni Malinen (3): mac80211_hwsim: Add minimal capability for vendor command/event testing bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi mac80211: Fix misplaced return in AES-GMAC key setup Julia Lawall (6): net/mlx5_core: don't export static symbol libertas_tf: if_usb.c: don't export static symbol ieee802154: don't export static symbol NFC: pn533: fix error return code wan: lmc: fix error return code cosa: fix error return code Julian Anastasov (1): ipvs: use 64-bit rates in stats Jörg Thalheim (1): bridge: add ageing_time, stp_state, priority over netlink KY Srinivasan (2): hv_netvsc: Cleanup the test for freeing skb when we use sendbuf mechanism hv_netvsc: Eliminate memory allocation in the packet send path Kalesh AP (3): be2net: refactor error detect/recovery function be2net: refactor adapter resource initialzation sequence into be_resume() be2net: refactor adapter resource cleanup sequence into be_cleanup() Kalle Valo (4): Merge tag 'iwlwifi-next-for-kalle-2015-03-01' of https://git.kernel.org/.../iwlwifi/iwlwifi-next Merge ath-next from ath.git Merge tag 'iwlwifi-next-for-kalle-2015-03-12' of https://git.kernel.org/.../iwlwifi/iwlwifi-next Merge tag 'iwlwifi-next-for-kalle-2015-04-02' of https://git.kernel.org/.../iwlwifi/iwlwifi-next Kamil Krawczyk (2): i40e: update Shadow RAM read/write functions i40e: Remove unneeded conversion Karicheri, Muralidharan (4): net: netcp: fix forward port number usage for 10G ethss net: netcp: use separate reg region for individual ethss modules net: netcp: select davinci_mdio driver by default net: netcp: enclose macros in parentheses Kenneth Klette Jonassen (1): tcp: fix bogus RTT for CC when retransmissions are acked Kevin Scott (2): i40e: Set BUF flag for Set Version AQ command i40e: Set FLAG_RD when sending buffer FW must read Keyur Chudgar (3): Documentation: dtb: Add port-id field for APM X-Gene ethernet dtb: xgene: Add second SGMII based 1G interface node drivers: net: xgene: Add second SGMII based 1G interface Kim, Ben Young Tae (3): Bluetooth: btusb: Add setup callback for chip init on USB Bluetooth: btusb: Add support for QCA ROME chipset family Bluetooth: btusb: Fix incorrect type in qca_device_info Larry Finger (2): ssb: Silence warning for unknown backplane revision rtlwifi: rtl8192cu: Add new USB ID Lars-Peter Clausen (1): cw1200: Fix suspend Lendacky, Thomas (12): amd-xgbe-phy: Use phydev advertising field vs supported amd-xgbe-phy: Use the phy_driver flags field amd-xgbe-phy: Provide support for auto-negotiation timeout amd-xgbe: Clarify output message about queues amd-xgbe: Use the new DMA memory barriers where appropriate amd-xgbe: Set DMA mask based on hardware register value amd-xgbe: Remove Tx coalescing amd-xgbe: Fix Rx coalescing reporting amd-xgbe: Use napi_alloc_skb when allocating skb in softirq amd-xgbe: Allow rx-frames coalescing to be changed anytime amd-xgbe: Move Rx mode configuration into init amd-xgbe: Add support for the netdev Tx watchdog Leon Nardella (1): ath9k_htc: Add new USB ID Li RongQing (1): virtio: simplify the using of received in virtnet_poll Liad Kaufman (3): iwlwifi: pcie: add rx packet sequence number to dbg print iwlwifi: mvm: add iccm data to 8000 b-step data dump iwlwifi: mvm: rs: fix comment indentation Loic Poulain (1): Bluetooth: hci_uart: Add setup callback Lorenzo Bianconi (2): ath9k: add per-vif TX power capability ath9k: add per-vif TX power capability to TX path Lubomir Rintel (1): ipv6: expose RFC4191 route preference via rtnetlink Luciano Coelho (12): iwlwifi: deprecate -9.ucode for 3160 / 7260 / 7265 iwlwifi: mvm: remove deprecated scan API code iwlwifi: mvm: don't iterate interfaces to disconnect in net-detect mac80211: handle drv_add_interface failures properly during reconfig mac80211: remove useless double check for open_count in __ieee80211_suspend() mac80211: remove duplicate check for quiescing when queueing work iwlwifi: mvm: don't double unlock the mutex in __iwl_mvm_resume() iwlwifi: mvm: add delay to scheduled scan iwlwifi: mvm: use debugfs_create_bool() for enable_scan_iteration_notif nl80211: add net-detect delay to wowlan info nl80211: small clarification of the sched_scan delay attribute iwlwifi: mvm: add debugfs entry with the number of net-detect scans Lukasz Rymanowski (3): Bluetooth: Do not allow LE connection if LE is not enabled Bluetooth: Improve error handling in connect acl Bluetooth: Enhance error codes pair device command Madhu Challa (2): igmp v6: add __ipv6_sock_mc_join and __ipv6_sock_mc_drop multicast: Extend ip address command to enable multicast group join/leave on Mahesh Bandewar (9): bonding: simple code refactor bonding: Verify RX LACPDU has proper dest mac-addr bonding: Implement port churn-machine (AD standard 43.4.17). bonding: implement bond_poll_controller() bonding: Remove hardcoded initialization bonding: deprecate BOND_MONITOR_CHURNED in favor of existing definitions bonding: Fix another case of LACPDU not sent on slave bonding: Code re-factoring for admin, oper-key operations bonding: Remove unnecessary initialization Maithili Hinge (2): mwifiex: Add support for auto ARP in mwifiex. mwifiex: Fix issue in the SDIO reset path of mwifiex. Marc Kleine-Budde (3): can: m_cam: m_can_fifo_write(): remove return from void function can: ems_usb: mark timestamp as little endian can: pcan_usb: pcan_usb_fd_send_cmd(): silence compiler warning about uninitialized var Marcel Holtmann (112): Bluetooth: Move A2MP_FEAT_EXT declaration into A2MP source Bluetooth: Make amp_mgr_list and amp_mgr_list_lock static Bluetooth: Make amp_mgr_lookup_by_state function static Bluetooth: Make a2mp_send function static Bluetooth: Make __next_ident function static. Bluetooth: btusb: Use matching names for Broadcom firmware files Bluetooth: Provide option to enable/disable debugfs information Bluetooth: Introduce controller setting information for static address Bluetooth: Increment management interface revision Bluetooth: Remove two else branches that are not needed Bluetooth: Add support connectable advertising setting Bluetooth: Introduce hci_dev_test_flag helper macro Bluetooth: Introduce hci_dev_set_flag helper macro Bluetooth: Introduce hci_dev_clear_flag helper macro Bluetooth: Introduce hci_dev_change_flag helper macro Bluetooth: Introduce hci_dev_test_and_change_flag helper macro Bluetooth: Introduce hci_dev_test_and_clear_flag helper macro Bluetooth: Introduce hci_dev_test_and_set_flag helper macro Bluetooth: Use DECLARE_BITMAP for hdev->dev_flags field Bluetooth: Merge hdev->dbg_flags fields into hdev->dev_flags Bluetooth: Add flags field and setting function for HCI sockets Bluetooth: Provide hci_send_to_flagged_channel helper function Bluetooth: Use special function to send filter management index events Bluetooth: Add support for extended index management events Bluetooth: Add support for extended index management command Bluetooth: Introduce trusted flag for management control sockets Bluetooth: Consolidate socket channel sending function back into one Bluetooth: Add hci_sock_test_flag helper function Bluetooth: Add support for untrusted access to management commands Bluetooth: Remove unneeded initializer for management command table Bluetooth: Add support for trust verification of management commands Bluetooth: Open management interface for untrusted users Bluetooth: Send global configuration updates to all management users Bluetooth: Use BIT(n) macro instead of manually encoding (1 << n) Bluetooth: Add simple version of Read Advertising Features command Bluetooth: Move eir_append_data function to a different location Bluetooth: Add defines for LE Bluetooth Device Address and LE Role Bluetooth: Add simple version of Read Local OOB Extended Data command Bluetooth: Fix BR/EDR out-of-band pairing with only initiator data Bluetooth: Remove unneeded HCI_CONN_REMOTE_OOB connection flag Bluetooth: Use kzfree instead of kfree in security manager Bluetooth: Create SMP device structure for local crypto context Bluetooth: Add constants for LE SC Confirmation and Random values Bluetooth: Add support for AES-CMAC hash for security manager device Bluetooth: Add function for generating LE SC out-of-band data Bluetooth: Return LE SC confirm and random values for out-of-band data Bluetooth: Use OOB key pair for LE SC pairing with OOB method Bluetooth: Use smp->local_pk + 32 instead of &smp->local_pk[32] Bluetooth: Use smp->remote_pk + 32 instead of &smp->remote_pk[32] Bluetooth: Add extra SMP_DBG statement for remote OOB data Bluetooth: Rename smp->local_rr into smp->local_rand Bluetooth: The P-256 randomizer is 16 octets long and not 19 octets Bluetooth: Do not include LE SC out-of-band data if not enabled Bluetooth: Fix length for Read Local OOB Extended Data respone packet Bluetooth: Add support for Local OOB Extended Data Update events Bluetooth: btusb: Fix minor whitespace issue in QCA ROME device entries Bluetooth: Fix potential NULL dereference in SMP channel setup Bluetooth: Gracefully response to enabling LE on LE only devices Bluetooth: Use HCI_MAX_AD_LENGTH constant instead hardcoded value Bluetooth: Read Verbose Config Version Info for Broadcom devices Bluetooth: Read Broadcom chip info for Apple Bluetooth devices Bluetooth: Filter list of supported commands/events for untrusted users Bluetooth: Fix minor typo in comment for static address setting Bluetooth: btusb: Consolidate Broadcom based device entries Bluetooth: Move memory location outside of hci_dev lock Bluetooth: Fix error returns for Read Local OOB Extended Data commands Bluetooth: Remove superfluous extra empty line between functions Bluetooth: Expose current Device ID information via debugfs Bluetooth: Remove unneeded extra ( ) in valid flags check Bluetooth: Restrict CMTP flags to only valid ones Bluetooth: Restrict HIDP flags to only valid ones Bluetooth: Restrict BNEP flags to only valid ones Bluetooth: Export ECDH selftest result in debugfs Bluetooth: Export SMP selftest result in debugfs Bluetooth: Disallow LE local out-of-band data when LE privacy is used Bluetooth: cmtp: Use BIT(x) instead of (1 << x) Bluetooth: hidp: Use BIT(x) instead of (1 << x) Bluetooth: Fix location of TX power field in LE advertising data Bluetooth: hci_uart: Add support for vendor detection flag Bluetooth: hci_uart: Add support Intel address configuration Bluetooth: hci_uart: Add support Broadcom address configuration Bluetooth: hci_uart: Remove unneeded cast of tty->disc_data Bluetooth: hci_uart: Fix indentation issues for multi-line functions Bluetooth: hci_uart: Remove unused h4->rx_skb field Bluetooth: hci_uart: Remove unused h4->rx_state and h4->rx_count field Bluetooth: Make data pointer of hci_recv_stream_fragment const Bluetooth: hci_uart: Use const data pointer for received data Bluetooth: hci_uart: Introduce h4_recv_buf helper function Bluetooth: hci_uart: Use h4_recv_buf helper for H:4 protocol Bluetooth: hci_uart: Use h4_recv_buf helper for Atheros AR300x Bluetooth: Remove hci_recv_stream_fragment function Bluetooth: hci_uart: Make struct hci_uart_proto always const Bluetooth: hci_uart: Add name information to hci_uart_proto struct Bluetooth: hci_uart: Remove the manual protocol init message Bluetooth: hci_uart: Update version number driver Bluetooth: btbcm: Introduce generic Broadcom Bluetooth support Bluetooth: btusb: Use generic functionality by Broadcom module Bluetooth: hci_uart: Use generic functionality from Broadcom module Bluetooth: btbcm: Add support for Broadcom controller setup Bluetooth: btusb: Add option for Broadcom protocol support Bluetooth: btusb: Move Broadcom quirk setting into support module Bluetooth: btusb: Update version number of the module Bluetooth: hci_uart: Move setup callback into different location Bluetooth: hci_uart: Add protocol support for Broadcom UART devices Bluetooth: btbcm: Add firmware table for UART based devices Bluetooth: hci_uart: Provide generic H:4 receive framework Bluetooth: btintel: Introduce generic Intel Bluetooth support Bluetooth: btusb: Use generic Intel support for address support Bluetooth: btusb: Move Intel command structs into its own header Bluetooth: hci_uart: Use generic Intel support for address setting Bluetooth: Read LE remote features during connection establishment Bluetooth: btusb: Use proper data structures for Intel vendor events Marcelo Ricardo Leitner (8): ipvs: allow rescheduling of new connections when port reuse is detected ipv4,ipv6: grab rtnl before locking the socket ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop} vxlan: Move socket initialization to within rtnl scope tipc: fix build issue when building without IPv6 vxlan: fix possible use of uninitialized in vxlan_igmp_{join, leave} ipv6: invert join/leave anycast rtnl/socket locking order vxlan: simplify if clause in dev_close Marek Puzyniak (2): ath10k: fix wmm params per vdev mac80211: initialize rate control earlier for tdls station Marek Vasut (1): rtlwifi: rtl8192cu: Add new device ID Markus Elfring (1): ath10k: delete unnecessary checks before the function call "release_firmware" Masanari Iida (1): wl1251: Fix typo in MODULE_DESCRIPTION in wl1251/main.c Masashi Honma (1): nl/mac80211: allow zero plink timeout to disable STA expiration Matan Barak (1): net/mlx4_en: Add Flow control statistics display via ethtool Mathieu Olivari (1): net: dsa: make NET_DSA manually selectable from the config Matt Jared (1): i40e: during LED interaction ignore activity LED src modes Matthew Vick (3): fm10k: Modify tunnel length header check when offloading fm10k: Implement ndo_features_check fm10k: Resolve various spelling errors and checkpatch warnings Matti Gottlieb (3): iwlwifi: change last 5ghz channel to 165 & add support for 8000 family iwlwifi: iwlmvm: LAR: disable LAR support due to NVM vs TLV conflict iwlwifi: mvm: Fix wrongfully flushing frames in the roc/off channel queue Miaoqing Pan (1): ath9k: add extra GPIO led support Michael Braun (1): mac80211: fix typo in debug output Michael S. Tsirkin (1): virtio: document queue state logic Michal Kazior (9): ath10k: defer AP self-peer removal wait ath10k: add vdev stats processing ath10k: change request stats command prototype ath10k: add more wmi fw stat defines ath10k: implement fw stats for wmi-tlv ath10k: add TxBF support ath10k: workaround corrupted htt rx events ath10k: workaround qca6174 sta powersave issue ath10k: disable multi-vif ps by default Michal Sekletar (1): filter: introduce SKF_AD_VLAN_TPID BPF extension Michal Simek (1): net: cadence: Remove Kconfig dependency on ARCH Mitch A Williams (2): i40e: don't spam the system log i40e: add ethtool RSS support Mitch Williams (16): i40e/i40evf: Refactor the receive routines i40evf: disable NAPI polling sooner i40evf: refactor reset i40evf: don't wait forever i40e: enable packet split only when IOMMU present i40e: print Rx packet split status i40e: don't disable PF LB when disabling VFs i40evf: ethtool RSS fixes i40vf: don't stop me now i40evf: delay releasing rings i40evf: resequence close operations i40evf: add FW version to ethtool info i40e: validate VSI param from VFs i40e: warn at the right time i40e: stop flow director on shutdown i40evf: protect VLAN filter list Muhammad Mahajna (2): net/mlx4_en: Add RX-FCS support net/mlx4_en: Add RX-ALL support Nathaniel Wesley Filardo (1): kafs: Add more "unified AFS" error codes Neerav Parikh (8): i40e: Use #define for the VSI connection type i40e: Add support for getlink, setlink ndo ops i40e: Skip the priority tagging if DCB is not enabled i40e: Fix issue with removal of apps from DBCNL app table i40e: Register DCBNL ops in MFP mode i40e: Only enable TC0 for NIC partition type i40e: Don't check operational or sync bit for App TLV i40e: Don't register/de-register apps on NIC partitions in MFP mode Nicholas Mc Guire (5): at86rf230: assign wait_for_completion_timeout to appropriately typed var brcmfmac: use msecs_to_jiffies for time conversion brcm80211: drop unreachable else case mesh_plink: use msecs_to_jiffies for proper time conversion mesh_plink: fixup type of timeout to match usage Nicholas Nunley (1): i40e/i40evf: restrict VC opcodes to their initial values Nicolas Dichtel (26): ieee802154: fix netns settings dev: introduce dev_get_iflink() ip6tnl,gre6,vti6: implement ndo_get_iflink ipip,gre,vti,sit: implement ndo_get_iflink ipmr,ip6mr: implement ndo_get_iflink vlan: implement ndo_get_iflink macvlan: implement ndo_get_iflink ipvlan: implement ndo_get_iflink infiniband/ipoib: implement ndo_get_iflink dsa: implement ndo_get_iflink net: remove iflink field from struct net_device dev: set iflink to 0 for virtual interfaces veth: set iflink to the peer veth netns: minor cleanup in rtnl_net_getid() netns: notify netns id events netns: allow to dump netns ids netdevice.h: remove iflink description selinux/nlmsg: add RTM_NEWNSID and RTM_GETNSID selinux/nlmsg: add RTM_GETNSID selinux/nlmsg: add XFRM_MSG_NEWSPDINFO selinux/nlmsg: add XFRM_MSG_GETSPDINFO selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFO selinux/nlmsg: add XFRM_MSG_REPORT selinux/nlmsg: add XFRM_MSG_MIGRATE selinux/nlmsg: add XFRM_MSG_MAPPING selinux/nlmsg: add a build time check for rtnl/xfrm cmds Nicolas Ferre (8): net/macb: only probe queues once and use stored values net/macb: add comment in macb_probe_queues net/macb: fix capabilities configuration net/macb: trivial: correct wording for caps net/macb: fix probe sequence to setup clocks earlier net/macb: add the user i/o to ethtool register dump net/macb: fix the peripheral version test net/macb: unify peripheral version testing Nicolas Iooss (2): wl18xx: show rx_frames_per_rates as an array as it really is mac802154: fix typo in header guard Oleksij Rempel (18): ath9k_htc: add new WMI_REG_RMW_CMDID command ath9k: ar9271_hw_pa_cal - use defs instead of magin numbers ath9k: ar9271_hw_pa_cal: use proper makroses. ath9k: ar9271_hw_pa_cal: use RMW buffer ath9k: add multi_read to be compatible with ath9k_htc ath9k: add new function ath9k_hw_read_array ath9k: ar9271_hw_pa_cal: use REG_READ_ARRAY ath9k: use one shot read in ath9k_hw_update_mibstats ath9k: ath9k_hw_loadnf: use REG_RMW ath9k: write buffer related optimisation in ar5008_hw_set_channel_regs ath9k: ath9k_hw_set_4k_power_cal_tabl: use rmw buffer ath9k: use rmw buffer in ath9k_hw_set_operating_mode and ath9k_hw_reset ath9k: ath9k_hw_4k_set_board_values: use rmw buffer ath9k: ath9k_hw_analog_shift_rmw: use REG_RMW ath9k: ath9k_hw_4k_set_board_values: use rmw buffer ath9k: use REG_RMW and rmw buffer in ath9k_hw_4k_set_gain ath9k: use REG_RMW and rmw buffer in ath9k_hw_4k_set_board_values ath9k: use REG_RMW and rmw buffer in ath9k_hw_def_set_gain Oliver Hartkopp (2): can: fix multiple delivery of a single CAN frame for overlapping CAN filters can: introduce new raw socket option to join the given CAN filters Oliver Neukum (1): usbnet: rename work handler Or Gerlitz (3): net/mlx4_core: Add basic support for QP max-rate limiting net/mlx4_en: Add tx queue maxrate support MAINTAINERS: Update mlx4_en entry Oren Givon (2): iwlwifi: add new 8260 series PCI IDs iwlwifi: add more new 8260 series PCI IDs Pablo Neira Ayuso (12): netfilter: ipt_CLUSTERIP: deprecate it in favour of xt_cluster netfilter: nf_tables: consolidate Kconfig options netfilter: nf_tables: limit maximum table name length to 32 bytes netfilter: bridge: move DNAT helper to br_netfilter netfilter: bridge: use rcu hook to resolve br_netfilter dependency netfilter: nf_tables: consolidate error path of nf_tables_newtable() netfilter: ip6t_REJECT: check for IP6T_F_PROTO netfilter: nf_tables: restore nf_log_trace() in nf_tables_core.c netfilter: nft_meta: fix cgroup matching Merge git://git.kernel.org/.../davem/net-next uapi: ebtables: don't include linux/if.h netfilter: nf_tables: get rid of the expression example code Padmanabh Ratnakar (1): be2net: assign CPU affinity hints to be2net IRQs Palik, Imre (1): xen-netback: making the bandwidth limiter runtime settable Patrick McHardy (47): netfilter: nf_tables: minor tracing cleanups netfilter: nf_tables: consolidate tracing invocations netfilter: nf_tables: cleanup nf_tables.h netfilter: nft_rbtree: fix locking netfilter: nf_tables: reject NFT_SET_ELEM_INTERVAL_END flag for non-interval sets netfilter: nf_tables: move struct net pointer to base chain netfilter: nf_tables: nft_queue does not depend on x_tables netfilter: nft_meta: use raw_smp_processor_id() rhashtable: provide len to obj_hashfn netfilter: nft_hash: restore struct nft_hash netfilter: nft_hash: indent rhashtable parameters netfilter: nft_hash: convert to use rhashtable callbacks netfilter: nf_tables: add set extensions netfilter: nf_tables: convert hash and rbtree to set extensions netfilter: nf_tables: consolide set element destruction netfilter: nf_tables: return set extensions from ->lookup() netfilter: nf_tables: add transaction helper functions netfilter: nf_tables: implement set transaction support netfilter: nf_tables: add set timeout API support netfilter: nf_tables: add set element timeout support netfilter: nf_tables: add set garbage collection helpers netfilter: nf_tables: add GC synchronization helpers netfilter: nft_hash: add support for timeouts netfilter: nf_tables: fix set selection when timeouts are requested netfilter: nf_tables: prepare set element accounting for async updates netfilter: nf_tables: support different set binding types netfilter: nf_tables: add support for dynamic set updates netfilter: nf_tables: support optional userdata for set elements netfilter: nf_tables: validate len in nft_validate_data_load() netfilter: nf_tables: rename nft_validate_data_load() netfilter: nft_lookup: use nft_validate_register_store() to validate types netfilter: nf_tables: kill nft_validate_output_register() netfilter: nf_tables: introduce nft_validate_register_load() netfilter: nf_tables: get rid of NFT_REG_VERDICT usage netfilter: nf_tables: use struct nft_verdict within struct nft_data netfilter: nf_tables: convert expressions to u32 register pointers netfilter: nf_tables: kill nft_data_cmp() netfilter: nf_tables: convert sets to u32 data pointers netfilter: nf_tables: add register parsing/dumping helpers netfilter: nf_tables: switch registers to 32 bit addressing netfilter: nf_tables: support variable sized data in nft_data_init() netfilter: nf_tables: variable sized set element keys / data netfilter: nf_tables: add helper functions for expression handling netfilter: nf_tables: prepare for expressions associated to set elements netfilter: nf_tables: mark stateful expressions netfilter: nf_tables: add flag to indicate set contains expressions netfilter: nft_dynset: dynamic stateful expression instantiation Paul M Stillwell Jr (1): i40e/i40evf: Fix output of i40e_debug_aq() for big endian machines Petri Gynther (26): net: bcmgenet: bcmgenet_init_tx_ring() cleanup net: bcmgenet: rework Tx queue init net: bcmgenet: precalculate TxCB->bd_addr net: bcmgenet: rename bcmgenet_hw_params->bds_cnt and GENET_DEFAULT_BD_CNT net: bcmgenet: simplify __bcmgenet_tx_reclaim() net: bcmgenet: set hw_params->rx_queues = 0 net: bcmgenet: adjust the call to alloc_etherdev_mqs() net: bcmgenet: add GENET_Q16_RX_BD_CNT and hw_params->rx_bds_per_q net: bcmgenet: rework Rx queue init net: bcmgenet: core changes for supporting multiple Rx queues net: bcmgenet: collect Rx discarded packet count net: bcmgenet: rewrite bcmgenet_rx_refill() net: bcmgenet: add support for Hardware Filter Block net: bcmgenet: remove priv->int0_mask and priv->int1_mask net: bcmgenet: modify Tx ring int_enable and int_disable vectors net: bcmgenet: simplify bcmgenet_init_dma() net: bcmgenet: tweak init_umac() net: bcmgenet: rework Tx NAPI code net: bcmgenet: rework Rx NAPI code net: bcmgenet: add support for multiple Rx queues net: bcmgenet: add UMAC_IRQ_RXDMA_DONE and UMAC_IRQ_TXDMA_DONE net: bcmgenet: remove __bcmgenet_fini_dma() net: bcmgenet: fix bcmgenet_open() net: bcmgenet: add UMAC_IRQ_LINK_EVENT net: bcmgenet: fix the call to phy_mac_interrupt() net: bcmgenet: enable MoCA link state change detection Phil Reid (1): stmmac: devm_reset_control_get can return PROBE_DEFER Priit Laes (9): rtlwifi: Remove unused defines from rtl8192cu driver rtlwifi: Remove unused defines from driver-specific def.h rtlwifi: Remove unused RF6052_MAX_REG define rtlwifi: Remove unused defines from cam.h rtlwifi: Remove unused defines from base.h rtlwifi: Remove unused defines from efuse.h rtlwifi: Remove unused RTL_SUPPORTED_CTRL_FILTER define rtlwifi: Clean rtl_evm_db_to_percentage a bit rtlwifi: No need to export rtl_evm_dbm_jaguar anymore Punnaiah Choudary Kalluri (2): net: macb: Include multi queue support for xilinx ZynqMP ethernet version net: macb: Fix multi queue support for xilinx ZynqMP Rafał Miłecki (17): brcmfmac: respect reason when deleting (deauthenticating) STA bcma: add helpers bringing PCIe hosted bus up / down bcma: change IRQ control function to accept bus as an argument bcma: support bringing up bus hosted on PCIe Gen 2 bcma: enable support for PCIe Gen 2 host devices bcma: add missing includes bcma: gpio: enable GPIO IRQ domain on BCM5301X bcma: make bcma_host_pci_(up|down) calls safe for every config bcma: move internal function declarations to private header bcma: prepare Kconfig symbol for PCI driver bcma: move PCI IRQ control function to host specific code bcma: allow disabling (not building) PCI driver Revert "bcma: Kconfig: Let it depend on PCI" bcma: gpio: use predictable base for all BCM47XX buses bgmac: register fixed PHY for ARM BCM470X / BCM5301X chipsets bgmac: allow enabling on ARCH_BCM_5301X ssb: add delay after PCI reset to fix SoC reboots Rasesh Mody (5): bnx2-cnic: Driver Rebranding Changes bnx2: Fix for Chip Initialization bnx2-cnic: Driver Version Update bna: QLogic BR-series Adapters Driver Rebranding bna: Update the Driver and Firmware Version Rasmus Villemoes (2): rtlwifi: rtl8821ae: Remove duplicate hex prefixes caif: remove unused struct member Richard Cochran (34): ptp: introduce get/set time methods with explicit 64 bit seconds. ptp: use the 64 bit gettime method for the SYS_OFFSET ioctl. ptp: use the 64 bit get/set time methods for the posix clock. ptp: blackfin: convert to the 64 bit get/set time methods. ptp: xgbe: convert to the 64 bit get/set time methods. ptp: bnx2x: convert to the 64 bit get/set time methods. ptp: tg3: convert to the 64 bit get/set time methods. ptp: fec: convert to the 64 bit get/set time methods. ptp: gianfar: convert to the 64 bit get/set time methods. ptp: e1000e: convert to the 64 bit get/set time methods. ptp: fm10k: convert to the 64 bit get/set time methods. ptp: i40e: convert to the 64 bit get/set time methods. ptp: igb: convert to the 64 bit get/set time methods. ptp: ixgbe: convert to the 64 bit get/set time methods. ptp: mlx4: convert to the 64 bit get/set time methods. ptp: sfc: convert to the 64 bit get/set time methods. ptp: stmmac: convert to the 64 bit get/set time methods. ptp: cpts: convert to the 64 bit get/set time methods. ptp: tilegx: convert to the 64 bit get/set time methods. ptp: dp83640: convert to the 64 bit get/set time methods. ptp: ixp46x: convert to the 64 bit get/set time methods. ptp: pch: convert to the 64 bit get/set time methods. ptp: remove 32 bit get/set methods. ptp: bnx2x: use helpers for converting ns to timespec. ptp: gianfar: use helpers for converting ns to timespec. ptp: e1000e: use helpers for converting ns to timespec. ptp: igb: use helpers for converting ns to timespec. ptp: mlx4: use helpers for converting ns to timespec. ptp: stmmac: use helpers for converting ns to timespec. ptp: cpts: use helpers for converting ns to timespec. ptp: blackfin: use helpers for converting ns to timespec. ptp: tg3: use helpers for converting ns to timespec. ptp: fec: use helpers for converting ns to timespec. ptp: ixgbe: use helpers for converting ns to timespec. Richard Weinberger (5): netlink: Fix portid type in netlink_notify nfc: Fix portid type in urelease_work netfilter: Fix portid types netfilter: Fix format string of nfnetlink_queue proc file netfilter: Fix format string of nfnetlink_log proc file Robert Shearman (2): mpls: Properly validate RTA_VIA payload length mpls: Allow mpls_gso and mpls_router to be built as modules Roopa Prabhu (3): bridge: add vlan info to bridge setlink and dellink notification messages bridge: fix link notification skb size calculation to include vlan ranges switchdev: fix stp update API to work with layered netdevices Rusty Russell (1): netdevice: document NETDEV_TX_BUSY deprecation. Sabrina Dubroca (2): e1000: add dummy allocator to fix race condition between mtu change and netpoll fib_trie: call fib_table_flush_external under RTNL Saeed Mahameed (6): net/mlx5_core: Clear doorbell record inside mlx5_db_alloc() net/mlx5_core: Fix Mellanox copyright note IB/mlx5: Fix Mellanox copyright note net/mlx5_core: Move completion eqs from mlx5_ib to mlx5_core net/mlx5_core: Modify arm CQ in preparation for upcoming Ethernet driver net/mlx5_core: Extend struct mlx5_interface to support multiple protocols Samuel Ortiz (2): NFC: nxp-nxi: Remove useless fw pointer check NFC: nxp-nci: Release firmware when switching to FW mode fails Sara Sharon (1): iwlwifi: fix spelling errors Sasha Levin (1): tipc: validate length of sockaddr in connect() for dgram/rdm Sathya Perla (8): be2net: move adapter fields alloc/free code to new routines be2net: get rid of be_get_initial_config() call from be_probe() be2net: refactor function initalization sequence into be_func_init() be2net: use a wrapper to schedule and cancel error detection task be2net: remove code duplication relating to Lancer reset sequence be2net: move be_func_init() call inside be_setup() be2net: setup xps queue mapping be2net: bump up the driver version to 10.6.0.1 Scott Branden (1): rt2x00: add new rt2800usb device DWA 130 Scott Feldman (21): rocker: fix non-portable err return codes rocker: rename lport to pport rocker: put port in FORWADING state after leaving bridge rtnetlink: add RTNH_F_EXTERNAL flag for fib offload netdevice: add IPv4 fib add/del ops switchdev: add IPv4 fib ndo ops wrappers switchdev: don't support custom ip rules, for now switchdev: implement IPv4 fib ndo wrappers ipv4: add net bool fib_offload_disabled fib: hook IPv4 fib for hardware offload rocker: implement IPv4 fib offloading switchdev: fix CONFIG_IP_MULTIPLE_TABLES compile issue rocker: fix some sparse warnings rocker: quiet sparce endianess warnings rocker: sparse: fix dynamic allocation on stack warning switchdev: add netlink flags to IPv4 FIB add op switchdev: add swdev ops switchdev: use new swdev ops netdev: remove ndo ops for switchdev rocker: replace fixed stack allocation with dynamic allocation switchdev: kernel-doc cleanup on swithdev ops Sebastian Andrzej Siewior (3): rt2x00usb: initialize the read value in case of failure rt2x00usb: check USB's request error code in rt2800usb_autorun_detect() rt2x00usb: drop rt2x00usb_disable_radio() from rt2800usb_disable_radio() Sebastian Ott (1): s390: fix /proc/interrupts output SenthilKumar Jegadeesan (1): mac80211: provide station PMF configuration to driver Sergey Ryazanov (2): ath5k: channel change fix ath5k: fix reset race Shani Michaeli (3): net/dcb: Add IEEE QCN attribute net/mlx4_core: Add basic elements for QCN net/mlx4_en: Add QCN parameters and statistics handling Shannon Nelson (12): i40e: rename debugfs clear_stats option i40e/i40evf: print FW build number in version string i40e/i40evf: grab NVM devstarter version not image version i40e: move IRQ tracking setup into MSIX setup i40e/i40evf: Refactor i40e_debug_aq and make some functions static i40e: rework vector reservation i40e: print port stats only on partition 1 i40e: future proof some sizeof calls i40e: tame the nvmupdate read and write complaints i40e: add MAC printing to debugfs dump VSI i40e: add NVM update events to AQ clean i40e: fix up VXLAN messages Shaohui Xie (3): net/fsl: remove dependency FSL_SOC from MDIO net/fsl: fix a bug in xgmac_mdio net/fsl: modify xgmac_mdio for little endian SoCs Sheng Yong (1): net: remove extra newlines Shengzhen Li (2): mwifiex: more_task flag for main_process mwifiex: avoid queue_work while work is ongoing Shradha Shah (2): sfc: Own header for nic-specific sriov functions, single instance of netdev_ops and sriov removed from Falcon code sfc: Enable VF's via a write to the sysfs file sriov_numvfs Shrikrishna Khare (1): Driver: Vmxnet3: Copy TCP header to mapped frame for IPv6 packets Simon Farnsworth (1): pppoe: Use workqueue to die properly when a PADT is received Simon Horman (5): vxlan: Correct path typo in comment switchdev: correct spelling of notifier in comments vxlan: Don't set s_addr in vxlan_create_sock vxlan: correct spelling in comments pkt_sched: fq: correct spelling of locally Sowmini Varadhan (3): RDS: Documentation: Document AF_RDS, PF_RDS and SOL_RDS correctly. RDS: only use passive connections when addresses match RDS: make sure not to loop forever inside rds_send_xmit Sravanthi Tangeda (5): i40e/i40evf: Bump Driver Versions i40e/i40evf: Update driver versions i40e/i40evf: Bump versions i40e/i40evf: Version bump i40e/i40evf: Bump version Sriharsha Basavapatna (4): be2net: Refactor wrb_fill_hdr() routine be2net: Refactor be_xmit_enqueue() routine be2net: Minor code cleanup in tx completion process be2net: Add a few inline functions to test TXQ conditions Stanislaw Gruszka (1): rt2800usb: check Autorun mode on FW load only once Stas Sergeev (2): add fixed_phy_update_state() - update state of fixed_phy mvneta: implement SGMII-based in-band link state signaling Stefan Raspl (1): qeth: Fix command sizes Stephen Hemminger (3): igb: doc don't refer to ifconfig ixgbe: fix documentation ixgb: remove references to ifconfig Stephen Rothwell (2): mpls: using vzalloc requires including vmalloc.h macb: Fix merge error. Sujith Manoharan (39): ath9k: Fix descriptors for keep-alive frame ath9k: Set keep awake timer ath9k: Add new MCI states ath9k: Check MCI PowerSave state ath9k: Handle additional patterns on wakeup ath9k: Clear additional WoW events ath9k: Restart TSF2 timers on wakeup ath9k: Move MCI registers to reg_mci.h ath9k: Remove useless check in MCI reset ath9k: Add new MCI configuration parameters ath9k: Handle 2-ANT AR9565 in MCI reset ath9k: Fix MCI TX control ath9k: Setup MCI statistics properly ath9k: Prepare MCI interface correctly ath9k: Fix GPM initialization ath9k: Mute BT properly ath9k: Remove useless return value check ath9k: Initialize MCI state correctly ath9k: Fix MCI scheme initialization ath9k: Fix wlan-active gpio for the AR9003 family ath9k: Handle timers for MCI ath9k: Fix issues in the main btcoex timer ath9k: Add PCIE powersave macros ath9k: Fix PLL powersave for AR9485 ath9k: Initialize pll_pwrsave for AR9462/AR9565 ath9k: Check allowed PCIE powersave configuration ath9k: Fix RTT chainmask usage ath9k: Add initial structures for AIC ath9k: Register private AIC ops ath9k: Add register definitions for AIC ath9k: Handle MCI_STATE_AIC_CAL_SINGLE ath9k: Finish AIC calibration ath9k: Process the AIC calibration results ath9k: Disable AIC by default ath9k: Handle MCI_STATE_AIC_CAL_RESET ath9k: Handle MCI_STATE_AIC_START ath9k: Handle MCI_STATE_AIC_CAL ath9k: Start AIC calibration during MCI reset ath9k: Fix AIC compilation error Syed Asifful Dayyan (1): brcmfmac: Add support for BCM4345 SDIO chipset. Tadeusz Struk (4): crypto: af_alg - Allow to link sgl crypto: algif - change algif_skcipher to be asynchronous crypto: af_alg - make exports consistant crypto: algif - use kmalloc instead of kzalloc Taehee Yoo (6): rtlwifi: Modify some USB de-initialize code. rtlwifi: rtl8192cu: Add case in rtl92cu_get_hw_reg rtlwifi: Remove duplicated prototype rtlwifi: rtl8192cu: remove unused arguments from _beacon_function_enable() rtlwifi: Change REG_CR+2 to MSR rtlwifi: Add encryption argument in rtl_is_special_data for checking DHCP packet. Tedd Ho-Jeong An (2): Bluetooth: Add shutdown callback before closing the device Bluetooth: Add device shutdown routine for Intel Bluetooth device Thomas Graf (11): rhashtable: Annotate RCU locking of walkers rhashtable: Avoid calculating hash again to unlock rhashtable: Round up/down min/max_size to ensure we respect limit rhashtable: Extend RCU read lock into rhashtable_insert_rehash() rhashtable: Use 'unsigned int' consistently rhashtable: Mark internal/private inline functions as such rhashtable: Disable automatic shrinking by default rhashtable: Add rhashtable_free_and_destroy() rtnetlink: Mark name argument of rtnl_create_link() const e1000e: Move pm_qos_req to e1000e adapter net_device: Reorder members to fill holes Thomas Huehn (10): mac80211: enhance readability of Minstrels rc_stats output mac80211: enhance readability of Minstrel-HTs rc_stats output mac80211: add new Minstrel statistic output via csv mac80211: add new Minstrel-HT statistic output via csv mac80211: unify Minstrel & Minstrel-HTs calculation of rate statistics mac80211: improve Minstrel variable & function naming mac80211: restructure per-rate throughput calculation into function mac80211: add max lossless throughput per rate mac80211: reduce calculation costs of EWMA mac80211: add standard deviation to Minstrel stats Thomas Körper (1): can: esd_usb2: Fix sparse warnings Tilman Schmidt (4): isdn/gigaset: restructure modem response parser (1) isdn/gigaset: restructure modem response parser (2) isdn/gigaset: restructure modem response parser (3) isdn/gigaset: restructure modem response parser (4) Tino Reichardt (1): net: via-rhine: add BQL support Todd Fujinaka (2): igb: use netif_carrier_off earlier when bringing if down igbvf: use netif_carrier_off earlier when bringing if down Tom Gundersen (1): cfg80211: pass name_assign_type to rdev_add_virtual_intf() Tom Herbert (1): udp: In udp_flow_src_port use random hash value if skb_get_hash fails Toshiaki Makita (7): vlan: Add features for stacked vlan device vlan: Introduce helper functions to check if skb is tagged net: Move check for multiple vlans to drivers net: Introduce passthru_features_check bonding: Don't segment multiple tagged packets on bonding device team: Don't segment multiple tagged packets on team device igb: Enable TSO for stacked vlan Ursula Braun (2): s390: remove claw driver MAINTAINERS: update S390 NETWORK DRIVERS maintainer Uwe Kleine-König (2): net: smc91x: make use of 4th parameter to devm_gpiod_get_index net: phy: at803x: simplify using devm_gpiod_get_optional and its 4th argument Varka Bhadram (2): mac802154: fix typo for device mac802154: fix transmission power datatype Varun Prakash (3): cxgb4: add cxgb4_fcoe.h and macro definitions for FCoE cxgb4: add cxgb4_fcoe.c for FCoE cxgb4: update Kconfig and Makefile for FCoE support Vasu Dev (2): i40e: setup FCoE device type ixgbe: adds x550 specific FCoE offloads Vasundhara Volam (3): be2net: avoid creating the non-RSS default RXQ if FW allows to be2net: re-distribute SRIOV resources allowed by FW be2net: implement .sriov_configure() PCI callback Vince Bridgers (2): net: eth: altera: Change access ports to mdio for all xMII applications net: eth: altera: Change reset_mac failure message masks from err to dbg Vitaly Kuznetsov (2): hv_netvsc: use single existing drop path in netvsc_start_xmit hv_netvsc: try linearizing big SKBs before dropping them Vlad Zolotarov (9): ixgbe: Refactor the RSS configuration code ixgbe: Add the appropriate ethtool ops to query RSS indirection table and key if_link: Add an additional parameter to ifla_vf_info for RSS querying ixgbe: Add a new netdev op to allow/prevent a VF from querying an RSS info ixgbe: Add a RETA query command to VF-PF channel API ixgbevf: Add a RETA query code ixgbe: Add GET_RSS_KEY command to VF-PF channel commands set ixgbevf: Add RSS Key query code ixgbevf: Add the appropriate ethtool ops to query RSS indirection table and key Vladimir Kondratiev (16): wil6210: boot loader wil6210: remove support for old hardware wil6210: enable fix for HW bug in 802.11->803.3 transform wil6210: branch prediction hints wil6210: rename 'secure_pcp' to 'privacy' wil6210: track privacy connection attribute wil6210: NAPI completion refactor wil6210: re-submit Rx frames to the wireless media if appropriate wil6210: support AP isolation wil6210: optimize index manipulation in wil_vring_reap_rx wil6210: fix check for FW responsiveness wil6210: Align Rx frames on 4*n+2 by having SNAP wil6210: Prefer ether_addr_copy() over memcpy() wil6210: add bcast structures to WMI wil6210: implement broadcast/multicast data wil6210: fall back to pseudo-DMS mcast for secure link and PBSS Vladimir Shulman (1): wil6210: Change of threshold for tx vring idleness measurement WANG Cong (12): net_sched: move tp->root allocation into route4_init() net_sched: move tp->root allocation into fw_init() net: clear skb->priority when forwarding to another netns net: allow to delete a whole device group fib6: install fib6 ops in the last step vxlan: fix a shadow local variable vxlan: do not exit on error in vxlan_stop() fou: avoid calling udp_del_offload() twice fou: exit early when parsing config fails fou: always use be16 for port fou: add network namespace support fou: implement FOU_CMD_GET Willem de Bruijn (1): fib: make netdev_switch_fib_ipv4_abort in header file static inline WingMan Kwok (1): net: netcp: ethss: enhancement to support NetCP 1.5 ethss Wolfgang Steinwender (1): net/macb: sqe_test_errors are TX errors, not RX errors Wu Fengguang (5): netfilter: ipset: fix boolreturn.cocci warnings mpls: rtm_mpls_policy[] can be static net/mlx4_en: mlx4_en_set_tx_maxrate() can be static cx82310_eth: fix semicolon.cocci warnings cxgb4: fix boolreturn.cocci warnings YOSHIFUJI Hideaki/吉藤英明 (3): net: neighbour: Add mcast_resolicit to configure the number of multicast resolicitations in PROBE state. net: neighbour: Document {mcast, ucast}_solicit, mcast_resolicit. net: Move the comment about unsettable socket-level options to default clause and update its reference. Yanir Lubetkin (3): e1000e: fix obscure comments e1000e: remove calls to ioremap/unmap for NVM addr e1000e: NVM write protect access removed from SPT HW Yaniv Rosner (2): bnx2x: Configure IFir et al. according to nvram bnx2x: Count number of link changes Yao Xiwei (1): vti6: fix uninit when using x-netns Yegor Yefremov (1): can: add combined rx/tx LED trigger support Ying Xue (11): tipc: Don't use iocb argument in socket layer net: Remove iocb argument from sendmsg and recvmsg net: kernel socket should be released in init_net namespace tipc: fix netns refcnt leak tipc: fix a potential deadlock when nametable is purged tipc: withdraw tipc topology server name when namespace is deleted tipc: fix compile error when IPV6=m and TIPC=y sctp: avoid to repeatedly declare external variables tipc: fix a link reset issue due to retransmission failures tipc: fix potential deadlock when all links are reset tipc: involve reference counter for node structure Yuval Mintz (1): bnx2x: Prevent probe as early as possible Zefir Kurtisi (3): ath9k: restart only triggering DFS detector line ath9k: add DFS support for extension channel ath9k: allow 40MHz radar detection width Zhaoyang Liu (7): mwifiex: fix usb tx data payload offset issue mwifiex: get rid of BA setup helper functions mwifiex: remove_bss_prio_lock mwifiex: preprocess packets from TX queue mwifiex: add SDIO rx single port aggregation mwifiex: delay skb allocation for RX until cmd53 over mwifiex: recover from skb allocation failures during RX hayeswang (3): r8152: separate USB_RX_EARLY_AGG r8152: change rx early size when the mtu is changed r8152: support setting rx coalesce kbuild test robot (1): ax25: Fix the build when CONFIG_INET is disabled stephen hemminger (4): tcp: silence registration message neterion: remove reference to ifconfig virtio: change comment in transmit vmxnet3: spelling fixes tadeusz.struk@intel.com (3): net: socket: add support for async operations crypto: algif - fix warn: unsigned 'used' is never less than zero crypto: algif - explicitly mark end of data Documentation/ABI/testing/sysfs-class-net | 8 + Documentation/ABI/testing/sysfs-class-net-queues | 8 + Documentation/devicetree/bindings/net/apm-xgene-enet.txt | 7 +- Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt | 8 +- Documentation/devicetree/bindings/net/ieee802154/cc2520.txt | 4 + Documentation/devicetree/bindings/net/keystone-netcp.txt | 34 +- Documentation/devicetree/bindings/net/macb.txt | 5 +- Documentation/devicetree/bindings/net/nfc/nxp-nci.txt | 35 + Documentation/devicetree/bindings/net/stmmac.txt | 7 +- Documentation/networking/can.txt | 20 +- Documentation/networking/filter.txt | 3 +- Documentation/networking/igb.txt | 4 +- Documentation/networking/ip-sysctl.txt | 49 +- Documentation/networking/ipvs-sysctl.txt | 21 + Documentation/networking/ixgb.txt | 12 +- Documentation/networking/ixgbe.txt | 14 +- Documentation/networking/mpls-sysctl.txt | 20 + Documentation/networking/packet_mmap.txt | 13 +- Documentation/networking/pktgen.txt | 62 +- Documentation/networking/rds.txt | 9 +- Documentation/networking/s2io.txt | 2 +- Documentation/networking/scaling.txt | 9 + Documentation/networking/vxge.txt | 2 +- MAINTAINERS | 11 +- arch/arm/boot/dts/at91sam9260.dtsi | 2 +- arch/arm/boot/dts/at91sam9263.dtsi | 2 +- arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 2 +- arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 2 +- arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +- arch/arm64/boot/dts/apm/apm-mustang.dts | 4 + arch/arm64/boot/dts/apm/apm-storm.dtsi | 32 +- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/asm-compat.h | 4 + arch/powerpc/include/asm/ppc-opcode.h | 2 + arch/powerpc/net/Makefile | 2 +- arch/powerpc/net/bpf_jit.h | 64 +- arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} | 70 +- arch/powerpc/net/bpf_jit_comp.c | 46 +- arch/s390/hypfs/inode.c | 2 +- arch/s390/include/asm/irq.h | 1 - arch/s390/kernel/irq.c | 1 - arch/tile/gxio/mpipe.c | 4 +- arch/tile/include/gxio/mpipe.h | 4 +- crypto/af_alg.c | 18 +- crypto/algif_hash.c | 12 +- crypto/algif_rng.c | 4 +- crypto/algif_skcipher.c | 245 ++- drivers/atm/nicstar.c | 90 -- drivers/bcma/Kconfig | 17 + drivers/bcma/Makefile | 4 +- drivers/bcma/bcma_private.h | 67 + drivers/bcma/driver_gpio.c | 27 +- drivers/bcma/driver_pci.c | 53 +- drivers/bcma/driver_pci_host.c | 1 + drivers/bcma/driver_pcie2.c | 29 +- drivers/bcma/host_pci.c | 77 +- drivers/bcma/main.c | 2 +- drivers/bluetooth/Kconfig | 41 + drivers/bluetooth/Makefile | 4 + drivers/bluetooth/ath3k.c | 1 + drivers/bluetooth/btbcm.c | 387 +++++ drivers/bluetooth/btbcm.h | 54 + drivers/bluetooth/btintel.c | 101 ++ drivers/bluetooth/btintel.h | 89 ++ drivers/bluetooth/btmrvl_drv.h | 1 + drivers/bluetooth/btmrvl_main.c | 14 + drivers/bluetooth/btusb.c | 689 ++++---- drivers/bluetooth/hci_ath.c | 49 +- drivers/bluetooth/hci_bcm.c | 153 ++ drivers/bluetooth/hci_bcsp.c | 18 +- drivers/bluetooth/hci_h4.c | 132 +- drivers/bluetooth/hci_h5.c | 16 +- drivers/bluetooth/hci_intel.c | 31 + drivers/bluetooth/hci_ldisc.c | 99 +- drivers/bluetooth/hci_ll.c | 16 +- drivers/bluetooth/hci_uart.h | 54 +- drivers/char/mem.c | 2 +- drivers/char/tile-srom.c | 1 - drivers/firewire/net.c | 13 - drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 - drivers/infiniband/hw/mlx4/main.c | 11 +- drivers/infiniband/hw/mlx5/ah.c | 2 +- drivers/infiniband/hw/mlx5/cq.c | 14 +- drivers/infiniband/hw/mlx5/doorbell.c | 2 +- drivers/infiniband/hw/mlx5/mad.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 107 +- drivers/infiniband/hw/mlx5/mem.c | 2 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 5 +- drivers/infiniband/hw/mlx5/mr.c | 2 +- drivers/infiniband/hw/mlx5/odp.c | 2 +- drivers/infiniband/hw/mlx5/qp.c | 8 +- drivers/infiniband/hw/mlx5/srq.c | 4 +- drivers/infiniband/hw/mlx5/user.h | 2 +- drivers/infiniband/hw/qib/qib_file_ops.c | 1 - drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 - drivers/isdn/gigaset/ev-layer.c | 365 +++-- drivers/isdn/i4l/isdn_net.c | 33 - drivers/isdn/mISDN/socket.c | 7 +- drivers/media/dvb-core/dvb_net.c | 1 - drivers/misc/mei/amthif.c | 1 - drivers/misc/mei/main.c | 1 - drivers/misc/mei/pci-me.c | 1 - drivers/net/arcnet/arcnet.c | 55 - drivers/net/bonding/bond_3ad.c | 101 +- drivers/net/bonding/bond_main.c | 40 +- drivers/net/bonding/bond_procfs.c | 43 +- drivers/net/caif/caif_serial.c | 1 - drivers/net/can/at91_can.c | 4 +- drivers/net/can/bfin_can.c | 258 ++- drivers/net/can/cc770/cc770_platform.c | 2 +- drivers/net/can/grcan.c | 2 +- drivers/net/can/led.c | 22 +- drivers/net/can/m_can/m_can.c | 4 +- drivers/net/can/mscan/mpc5xxx_can.c | 2 +- drivers/net/can/sja1000/sja1000_platform.c | 2 +- drivers/net/can/usb/ems_usb.c | 11 +- drivers/net/can/usb/esd_usb2.c | 4 +- drivers/net/can/usb/kvaser_usb.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 2 +- drivers/net/can/xilinx_can.c | 2 +- drivers/net/dsa/Kconfig | 13 +- drivers/net/dsa/bcm_sf2.c | 155 +- drivers/net/dsa/bcm_sf2.h | 2 + drivers/net/dsa/bcm_sf2_regs.h | 15 + drivers/net/dsa/mv88e6123_61_65.c | 199 +-- drivers/net/dsa/mv88e6131.c | 182 +-- drivers/net/dsa/mv88e6171.c | 202 +-- drivers/net/dsa/mv88e6352.c | 307 +--- drivers/net/dsa/mv88e6xxx.c | 982 +++++++++++- drivers/net/dsa/mv88e6xxx.h | 245 ++- drivers/net/ethernet/adi/bfin_mac.c | 16 +- drivers/net/ethernet/aeroflex/greth.c | 2 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- drivers/net/ethernet/altera/altera_tse_main.c | 24 +- drivers/net/ethernet/amd/amd8111e.c | 4 +- drivers/net/ethernet/amd/amd8111e.h | 2 +- drivers/net/ethernet/amd/pcnet32.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 81 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 68 +- drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 29 +- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 22 +- drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 13 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 17 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 2 + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 189 ++- drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 23 +- drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 10 +- drivers/net/ethernet/apple/bmac.c | 2 +- drivers/net/ethernet/apple/mace.c | 4 +- drivers/net/ethernet/apple/macmace.c | 2 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 4 +- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- drivers/net/ethernet/broadcom/Kconfig | 10 +- drivers/net/ethernet/broadcom/bgmac.c | 496 ++++-- drivers/net/ethernet/broadcom/bgmac.h | 23 +- drivers/net/ethernet/broadcom/bnx2.c | 29 +- drivers/net/ethernet/broadcom/bnx2.h | 4 +- drivers/net/ethernet/broadcom/bnx2_fw.h | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 15 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 94 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 31 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 4 +- drivers/net/ethernet/broadcom/cnic.c | 6 +- drivers/net/ethernet/broadcom/cnic_if.h | 8 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1106 +++++++++---- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 50 +- drivers/net/ethernet/broadcom/genet/bcmmii.c | 45 +- drivers/net/ethernet/broadcom/tg3.c | 18 +- drivers/net/ethernet/brocade/Kconfig | 8 +- drivers/net/ethernet/brocade/Makefile | 2 +- drivers/net/ethernet/brocade/bna/Kconfig | 12 +- drivers/net/ethernet/brocade/bna/Makefile | 3 +- drivers/net/ethernet/brocade/bna/bfa_cee.c | 7 +- drivers/net/ethernet/brocade/bna/bfa_cee.h | 7 +- drivers/net/ethernet/brocade/bna/bfa_cs.h | 7 +- drivers/net/ethernet/brocade/bna/bfa_defs.h | 7 +- drivers/net/ethernet/brocade/bna/bfa_defs_cna.h | 9 +- drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h | 7 +- drivers/net/ethernet/brocade/bna/bfa_defs_status.h | 7 +- drivers/net/ethernet/brocade/bna/bfa_ioc.c | 11 +- drivers/net/ethernet/brocade/bna/bfa_ioc.h | 7 +- drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 9 +- drivers/net/ethernet/brocade/bna/bfa_msgq.c | 7 +- drivers/net/ethernet/brocade/bna/bfa_msgq.h | 7 +- drivers/net/ethernet/brocade/bna/bfi.h | 11 +- drivers/net/ethernet/brocade/bna/bfi_cna.h | 7 +- drivers/net/ethernet/brocade/bna/bfi_enet.h | 7 +- drivers/net/ethernet/brocade/bna/bfi_reg.h | 13 +- drivers/net/ethernet/brocade/bna/bna.h | 7 +- drivers/net/ethernet/brocade/bna/bna_enet.c | 7 +- drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 9 +- drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 7 +- drivers/net/ethernet/brocade/bna/bna_types.h | 7 +- drivers/net/ethernet/brocade/bna/bnad.c | 11 +- drivers/net/ethernet/brocade/bna/bnad.h | 9 +- drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 7 +- drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 7 +- drivers/net/ethernet/brocade/bna/cna.h | 11 +- drivers/net/ethernet/brocade/bna/cna_fwimg.c | 7 +- drivers/net/ethernet/cadence/Kconfig | 12 +- drivers/net/ethernet/cadence/Makefile | 1 - drivers/net/ethernet/cadence/at91_ether.c | 481 ------ drivers/net/ethernet/cadence/macb.c | 744 ++++++--- drivers/net/ethernet/cadence/macb.h | 40 +- drivers/net/ethernet/calxeda/xgmac.c | 20 +- drivers/net/ethernet/chelsio/Kconfig | 11 + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/sge.c | 20 +- drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/Makefile | 3 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 60 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 915 +++++++++++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c | 122 ++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.h | 57 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1757 ++------------------ drivers/net/ethernet/chelsio/cxgb4/sge.c | 154 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 734 ++++++++- drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 25 + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 5 +- drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2 +- drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 6 +- drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 2 +- drivers/net/ethernet/cirrus/cs89x0.c | 2 +- drivers/net/ethernet/cisco/enic/enic_main.c | 8 +- drivers/net/ethernet/dec/tulip/dmfe.c | 2 +- drivers/net/ethernet/dec/tulip/uli526x.c | 2 +- drivers/net/ethernet/emulex/benet/be.h | 57 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 203 ++- drivers/net/ethernet/emulex/benet/be_cmds.h | 23 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 1236 ++++++++------- drivers/net/ethernet/ethoc.c | 2 +- drivers/net/ethernet/freescale/Kconfig | 2 - drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 2 +- drivers/net/ethernet/freescale/fec_ptp.c | 17 +- drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 4 +- drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c | 2 +- drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 4 +- drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 204 ++- drivers/net/ethernet/freescale/gianfar.h | 32 +- drivers/net/ethernet/freescale/gianfar_ptp.c | 23 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/freescale/xgmac_mdio.c | 98 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- drivers/net/ethernet/ibm/emac/core.c | 2 +- drivers/net/ethernet/ibm/emac/mal.c | 2 +- drivers/net/ethernet/ibm/emac/rgmii.c | 2 +- drivers/net/ethernet/ibm/emac/tah.c | 2 +- drivers/net/ethernet/ibm/emac/zmii.c | 2 +- drivers/net/ethernet/intel/e100.c | 8 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 20 +- drivers/net/ethernet/intel/e1000e/defines.h | 1 + drivers/net/ethernet/intel/e1000e/e1000.h | 3 + drivers/net/ethernet/intel/e1000e/ethtool.c | 6 +- drivers/net/ethernet/intel/e1000e/hw.h | 6 + drivers/net/ethernet/intel/e1000e/ich8lan.c | 776 ++++++++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 9 + drivers/net/ethernet/intel/e1000e/netdev.c | 81 +- drivers/net/ethernet/intel/e1000e/ptp.c | 25 +- drivers/net/ethernet/intel/e1000e/regs.h | 3 + drivers/net/ethernet/intel/fm10k/fm10k.h | 10 +- drivers/net/ethernet/intel/fm10k/fm10k_common.c | 3 +- drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 6 +- drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 8 +- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 95 +- drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 53 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 72 +- drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 52 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 54 +- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 63 +- drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 33 +- drivers/net/ethernet/intel/fm10k/fm10k_ptp.c | 17 +- drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_type.h | 5 +- drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 20 +- drivers/net/ethernet/intel/i40e/Makefile | 2 +- drivers/net/ethernet/intel/i40e/i40e.h | 60 +- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 + drivers/net/ethernet/intel/i40e/i40e_common.c | 289 +++- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 25 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 48 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 494 ++++-- drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 35 +- drivers/net/ethernet/intel/i40e/i40e_fcoe.h | 1 - drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 921 ++++++++--- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 95 +- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 12 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 26 +- drivers/net/ethernet/intel/i40e/i40e_register.h | 50 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 489 ++++-- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 17 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 20 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 42 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 413 ++--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 17 +- drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_common.c | 59 +- drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 3 +- drivers/net/ethernet/intel/i40evf/i40e_register.h | 50 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 463 ++++-- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 17 +- drivers/net/ethernet/intel/i40evf/i40e_type.h | 9 +- drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 42 +- drivers/net/ethernet/intel/i40evf/i40evf.h | 2 + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 23 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 174 +- drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c | 2 + drivers/net/ethernet/intel/igb/igb_main.c | 5 +- drivers/net/ethernet/intel/igb/igb_ptp.c | 77 +- drivers/net/ethernet/intel/igbvf/defines.h | 128 +- drivers/net/ethernet/intel/igbvf/ethtool.c | 83 +- drivers/net/ethernet/intel/igbvf/igbvf.h | 103 +- drivers/net/ethernet/intel/igbvf/mbx.c | 21 +- drivers/net/ethernet/intel/igbvf/mbx.h | 53 +- drivers/net/ethernet/intel/igbvf/netdev.c | 394 ++--- drivers/net/ethernet/intel/igbvf/regs.h | 123 +- drivers/net/ethernet/intel/igbvf/vf.c | 43 +- drivers/net/ethernet/intel/igbvf/vf.h | 83 +- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 3 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 15 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 10 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 7 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 56 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 59 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 122 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 3 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 291 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 5 + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 23 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 95 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 22 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 76 +- drivers/net/ethernet/intel/ixgbevf/defines.h | 285 ++-- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 155 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 84 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 234 +-- drivers/net/ethernet/intel/ixgbevf/mbx.c | 43 +- drivers/net/ethernet/intel/ixgbevf/mbx.h | 98 +- drivers/net/ethernet/intel/ixgbevf/regs.h | 105 +- drivers/net/ethernet/intel/ixgbevf/vf.c | 189 ++- drivers/net/ethernet/intel/ixgbevf/vf.h | 17 +- drivers/net/ethernet/marvell/mvneta.c | 106 +- drivers/net/ethernet/marvell/mvpp2.c | 4 +- drivers/net/ethernet/mellanox/mlx4/Makefile | 5 +- drivers/net/ethernet/mellanox/mlx4/cmd.c | 301 +++- drivers/net/ethernet/mellanox/mlx4/en_clock.c | 15 +- drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 223 +++ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 252 ++- drivers/net/ethernet/mellanox/mlx4/en_main.c | 5 + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 192 ++- drivers/net/ethernet/mellanox/mlx4/en_port.c | 182 ++- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 +- drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 12 +- drivers/net/ethernet/mellanox/mlx4/eq.c | 4 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 103 +- drivers/net/ethernet/mellanox/mlx4/fw.h | 2 + drivers/net/ethernet/mellanox/mlx4/fw_qos.c | 289 ++++ drivers/net/ethernet/mellanox/mlx4/fw_qos.h | 145 ++ drivers/net/ethernet/mellanox/mlx4/main.c | 33 + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 32 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 57 +- drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 107 ++ drivers/net/ethernet/mellanox/mlx4/port.c | 145 +- drivers/net/ethernet/mellanox/mlx4/qp.c | 10 + drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 19 +- drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 85 +- drivers/net/ethernet/mellanox/mlx5/core/cq.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 124 +- drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/mr.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/pd.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/port.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/qp.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/srq.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/uar.c | 2 +- drivers/net/ethernet/micrel/ksz884x.c | 2 +- drivers/net/ethernet/moxa/moxart_ether.c | 2 +- drivers/net/ethernet/neterion/s2io.c | 10 +- drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 19 + drivers/net/ethernet/neterion/vxge/vxge-ethtool.h | 19 - drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +- drivers/net/ethernet/packetengines/hamachi.c | 2 +- drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +- drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- drivers/net/ethernet/renesas/sh_eth.c | 259 ++- drivers/net/ethernet/renesas/sh_eth.h | 23 +- drivers/net/ethernet/rocker/rocker.c | 854 ++++++++-- drivers/net/ethernet/rocker/rocker.h | 32 +- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 12 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/farch.c | 4 +- drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +- drivers/net/ethernet/sfc/ptp.c | 22 +- drivers/net/ethernet/sfc/siena_sriov.c | 2 +- drivers/net/ethernet/sfc/vfdi.h | 4 +- drivers/net/ethernet/smsc/smc91x.c | 26 +- drivers/net/ethernet/smsc/smsc911x.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 17 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 12 +- drivers/net/ethernet/sun/sungem.c | 18 +- drivers/net/ethernet/sun/sunhme.c | 16 +- drivers/net/ethernet/sun/sunvnet.c | 8 +- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/ethernet/ti/cpts.c | 19 +- drivers/net/ethernet/ti/netcp.h | 5 +- drivers/net/ethernet/ti/netcp_core.c | 27 +- drivers/net/ethernet/ti/netcp_ethss.c | 1581 ++++++++++++++---- drivers/net/ethernet/tile/tilegx.c | 9 +- drivers/net/ethernet/toshiba/Kconfig | 4 +- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +- drivers/net/ethernet/via/via-rhine.c | 31 +- drivers/net/ethernet/via/via-velocity.c | 2 +- drivers/net/ethernet/wiznet/w5100.c | 2 +- drivers/net/ethernet/wiznet/w5300.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- drivers/net/hamradio/6pack.c | 31 +- drivers/net/hamradio/baycom_epp.c | 3 + drivers/net/hamradio/bpqether.c | 3 + drivers/net/hamradio/dmascc.c | 3 + drivers/net/hamradio/hdlcdrv.c | 3 + drivers/net/hamradio/mkiss.c | 44 +- drivers/net/hamradio/scc.c | 3 + drivers/net/hamradio/yam.c | 3 + drivers/net/hyperv/hyperv_net.h | 33 +- drivers/net/hyperv/netvsc.c | 217 ++- drivers/net/hyperv/netvsc_drv.c | 116 +- drivers/net/hyperv/rndis_filter.c | 16 +- drivers/net/ieee802154/at86rf230.c | 358 +++-- drivers/net/ieee802154/cc2520.c | 150 +- drivers/net/ipvlan/ipvlan_core.c | 2 +- drivers/net/ipvlan/ipvlan_main.c | 10 +- drivers/net/macvlan.c | 10 +- drivers/net/macvtap.c | 9 +- drivers/net/netconsole.c | 5 +- drivers/net/phy/Kconfig | 4 +- drivers/net/phy/amd-xgbe-phy.c | 98 +- drivers/net/phy/at803x.c | 11 +- drivers/net/phy/bcm7xxx.c | 1 + drivers/net/phy/broadcom.c | 14 + drivers/net/phy/dp83640.c | 19 +- drivers/net/phy/fixed_phy.c | 29 + drivers/net/phy/mdio-bcm-unimac.c | 2 +- drivers/net/phy/mdio-gpio.c | 2 +- drivers/net/phy/mdio-mux-gpio.c | 2 +- drivers/net/phy/mdio-mux-mmioreg.c | 2 +- drivers/net/phy/mdio-octeon.c | 2 +- drivers/net/ppp/pppoe.c | 25 +- drivers/net/ppp/pptp.c | 2 +- drivers/net/team/team.c | 4 + drivers/net/tun.c | 6 +- drivers/net/usb/catc.c | 4 +- drivers/net/usb/cdc_mbim.c | 2 +- drivers/net/usb/cx82310_eth.c | 2 +- drivers/net/usb/hso.c | 13 +- drivers/net/usb/lg-vl600.c | 2 +- drivers/net/usb/qmi_wwan.c | 2 +- drivers/net/usb/r8152.c | 131 +- drivers/net/usb/usbnet.c | 4 +- drivers/net/veth.c | 15 + drivers/net/virtio_net.c | 16 +- drivers/net/vmxnet3/vmxnet3_drv.c | 29 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 4 +- drivers/net/vmxnet3/vmxnet3_int.h | 5 +- drivers/net/vxlan.c | 309 ++-- drivers/net/wan/cosa.c | 1 + drivers/net/wan/lmc/lmc_main.c | 1 + drivers/net/wireless/airo.c | 4 +- drivers/net/wireless/at76c50x-usb.c | 6 +- drivers/net/wireless/ath/ar5523/ar5523.c | 9 +- drivers/net/wireless/ath/ar5523/ar5523.h | 1 - drivers/net/wireless/ath/ath.h | 3 + drivers/net/wireless/ath/ath10k/ce.h | 2 +- drivers/net/wireless/ath/ath10k/core.c | 8 +- drivers/net/wireless/ath/ath10k/core.h | 27 + drivers/net/wireless/ath/ath10k/debug.c | 101 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- drivers/net/wireless/ath/ath10k/mac.c | 169 +- drivers/net/wireless/ath/ath10k/pci.c | 4 +- drivers/net/wireless/ath/ath10k/wmi-ops.h | 7 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 132 +- drivers/net/wireless/ath/ath10k/wmi-tlv.h | 15 + drivers/net/wireless/ath/ath10k/wmi.c | 27 +- drivers/net/wireless/ath/ath10k/wmi.h | 18 +- drivers/net/wireless/ath/ath5k/ath5k.h | 1 + drivers/net/wireless/ath/ath5k/base.c | 33 +- drivers/net/wireless/ath/ath5k/reset.c | 24 - drivers/net/wireless/ath/ath6kl/cfg80211.c | 17 +- drivers/net/wireless/ath/ath6kl/cfg80211.h | 1 + drivers/net/wireless/ath/ath6kl/core.c | 4 +- drivers/net/wireless/ath/ath6kl/main.c | 2 +- drivers/net/wireless/ath/ath9k/Makefile | 3 +- drivers/net/wireless/ath/ath9k/ani.c | 20 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 5 +- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 77 +- drivers/net/wireless/ath/ath9k/ar9003_aic.c | 599 +++++++ drivers/net/wireless/ath/ath9k/ar9003_aic.h | 61 + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 84 +- drivers/net/wireless/ath/ath9k/ar9003_mci.c | 178 ++- drivers/net/wireless/ath/ath9k/ar9003_mci.h | 61 +- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 25 - drivers/net/wireless/ath/ath9k/ar9003_rtt.c | 6 +- drivers/net/wireless/ath/ath9k/ar9003_wow.c | 61 +- drivers/net/wireless/ath/ath9k/ath9k.h | 3 +- drivers/net/wireless/ath/ath9k/btcoex.c | 43 +- drivers/net/wireless/ath/ath9k/btcoex.h | 13 + drivers/net/wireless/ath/ath9k/calib.c | 19 +- drivers/net/wireless/ath/ath9k/debug.c | 5 +- drivers/net/wireless/ath/ath9k/dfs.c | 44 +- drivers/net/wireless/ath/ath9k/eeprom.c | 7 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 36 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 34 +- drivers/net/wireless/ath/ath9k/gpio.c | 103 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 1 + drivers/net/wireless/ath/ath9k/htc.h | 5 + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 142 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- drivers/net/wireless/ath/ath9k/hw-ops.h | 8 + drivers/net/wireless/ath/ath9k/hw.c | 54 +- drivers/net/wireless/ath/ath9k/hw.h | 33 +- drivers/net/wireless/ath/ath9k/init.c | 23 +- drivers/net/wireless/ath/ath9k/main.c | 56 +- drivers/net/wireless/ath/ath9k/mci.c | 5 +- drivers/net/wireless/ath/ath9k/reg.h | 279 +--- drivers/net/wireless/ath/ath9k/reg_aic.h | 168 ++ drivers/net/wireless/ath/ath9k/reg_mci.h | 310 ++++ drivers/net/wireless/ath/ath9k/reg_wow.h | 10 +- drivers/net/wireless/ath/ath9k/wmi.c | 15 +- drivers/net/wireless/ath/ath9k/wmi.h | 18 +- drivers/net/wireless/ath/ath9k/xmit.c | 42 +- drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 68 +- drivers/net/wireless/ath/wil6210/debugfs.c | 37 +- drivers/net/wireless/ath/wil6210/ethtool.c | 34 +- drivers/net/wireless/ath/wil6210/fw.c | 3 +- drivers/net/wireless/ath/wil6210/fw_inc.c | 4 +- drivers/net/wireless/ath/wil6210/interrupt.c | 70 +- drivers/net/wireless/ath/wil6210/main.c | 202 ++- drivers/net/wireless/ath/wil6210/netdev.c | 4 +- drivers/net/wireless/ath/wil6210/pcie_bus.c | 24 +- drivers/net/wireless/ath/wil6210/txrx.c | 417 +++-- drivers/net/wireless/ath/wil6210/wil6210.h | 42 +- drivers/net/wireless/ath/wil6210/wmi.c | 25 +- drivers/net/wireless/ath/wil6210/wmi.h | 23 +- drivers/net/wireless/atmel.c | 16 +- drivers/net/wireless/b43/dma.c | 12 +- drivers/net/wireless/b43/main.c | 14 +- drivers/net/wireless/b43legacy/dma.c | 6 +- drivers/net/wireless/b43legacy/main.c | 8 +- drivers/net/wireless/b43legacy/rfkill.c | 8 +- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 174 +- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 28 +- drivers/net/wireless/brcm80211/brcmfmac/chip.c | 310 +++- drivers/net/wireless/brcm80211/brcmfmac/chip.h | 12 +- drivers/net/wireless/brcm80211/brcmfmac/core.c | 30 + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 5 +- drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h | 8 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 5 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 24 +- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 308 ++-- drivers/net/wireless/brcm80211/brcmfmac/sdio.h | 47 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 10 +- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 11 +- drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 + drivers/net/wireless/brcm80211/include/chipcommon.h | 9 +- drivers/net/wireless/cw1200/cw1200_spi.c | 11 +- drivers/net/wireless/cw1200/sta.c | 6 +- drivers/net/wireless/cw1200/txrx.c | 2 +- drivers/net/wireless/hostap/hostap_80211_tx.c | 4 +- drivers/net/wireless/hostap/hostap_ap.c | 8 +- drivers/net/wireless/hostap/hostap_info.c | 2 +- drivers/net/wireless/hostap/hostap_main.c | 5 +- drivers/net/wireless/hostap/hostap_wlan.h | 33 +- drivers/net/wireless/ipw2x00/Kconfig | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 8 +- drivers/net/wireless/ipw2x00/ipw2200.c | 6 +- drivers/net/wireless/iwlegacy/4965-rs.c | 2 +- drivers/net/wireless/iwlegacy/common.c | 2 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 15 +- drivers/net/wireless/iwlwifi/dvm/main.c | 2 +- drivers/net/wireless/iwlwifi/dvm/rs.c | 7 +- drivers/net/wireless/iwlwifi/dvm/tx.c | 6 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 12 +- drivers/net/wireless/iwlwifi/iwl-8000.c | 18 +- drivers/net/wireless/iwlwifi/iwl-config.h | 10 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 18 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 132 +- drivers/net/wireless/iwlwifi/iwl-drv.h | 4 +- drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 1 + drivers/net/wireless/iwlwifi/iwl-eeprom-read.c | 4 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +- drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 54 +- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 242 ++- drivers/net/wireless/iwlwifi/iwl-fw.h | 53 +- drivers/net/wireless/iwlwifi/iwl-io.c | 15 +- drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 410 +++-- drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 18 +- drivers/net/wireless/iwlwifi/iwl-op-mode.h | 4 +- drivers/net/wireless/iwlwifi/iwl-phy-db.c | 4 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 53 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 31 +- drivers/net/wireless/iwlwifi/mvm/coex.c | 226 +-- drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 75 +- drivers/net/wireless/iwlwifi/mvm/d3.c | 32 +- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 55 +- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 63 +- drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 47 - drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +- drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 3 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 205 +-- drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h | 64 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 134 +- drivers/net/wireless/iwlwifi/mvm/fw.c | 160 +- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 41 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 514 +++++- drivers/net/wireless/iwlwifi/mvm/mvm.h | 206 ++- drivers/net/wireless/iwlwifi/mvm/nvm.c | 327 +++- drivers/net/wireless/iwlwifi/mvm/ops.c | 81 +- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 6 +- drivers/net/wireless/iwlwifi/mvm/power.c | 9 +- drivers/net/wireless/iwlwifi/mvm/quota.c | 3 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 289 ++-- drivers/net/wireless/iwlwifi/mvm/rs.h | 7 +- drivers/net/wireless/iwlwifi/mvm/rx.c | 150 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 671 ++------ drivers/net/wireless/iwlwifi/mvm/sf.c | 67 +- drivers/net/wireless/iwlwifi/mvm/sta.c | 33 +- drivers/net/wireless/iwlwifi/mvm/sta.h | 6 +- drivers/net/wireless/iwlwifi/mvm/time-event.c | 101 +- drivers/net/wireless/iwlwifi/mvm/time-event.h | 4 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 12 + drivers/net/wireless/iwlwifi/mvm/utils.c | 281 +++- drivers/net/wireless/iwlwifi/pcie/drv.c | 27 +- drivers/net/wireless/iwlwifi/pcie/internal.h | 4 + drivers/net/wireless/iwlwifi/pcie/rx.c | 8 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 219 ++- drivers/net/wireless/iwlwifi/pcie/tx.c | 63 +- drivers/net/wireless/libertas/cfg.c | 6 +- drivers/net/wireless/libertas/debugfs.c | 3 +- drivers/net/wireless/libertas/main.c | 4 +- drivers/net/wireless/libertas_tf/if_usb.c | 2 - drivers/net/wireless/libertas_tf/main.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 109 +- drivers/net/wireless/mwifiex/11n.c | 18 +- drivers/net/wireless/mwifiex/11n.h | 32 - drivers/net/wireless/mwifiex/11n_aggr.c | 16 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 7 +- drivers/net/wireless/mwifiex/cfg80211.c | 202 ++- drivers/net/wireless/mwifiex/decl.h | 11 +- drivers/net/wireless/mwifiex/fw.h | 11 + drivers/net/wireless/mwifiex/init.c | 31 +- drivers/net/wireless/mwifiex/main.c | 98 +- drivers/net/wireless/mwifiex/main.h | 34 +- drivers/net/wireless/mwifiex/pcie.c | 33 +- drivers/net/wireless/mwifiex/pcie.h | 6 +- drivers/net/wireless/mwifiex/sdio.c | 233 ++- drivers/net/wireless/mwifiex/sdio.h | 74 +- drivers/net/wireless/mwifiex/sta_cmd.c | 61 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 21 + drivers/net/wireless/mwifiex/sta_event.c | 6 +- drivers/net/wireless/mwifiex/txrx.c | 136 +- drivers/net/wireless/mwifiex/usb.c | 6 +- drivers/net/wireless/mwifiex/util.c | 30 + drivers/net/wireless/mwifiex/wmm.c | 50 +- drivers/net/wireless/mwifiex/wmm.h | 2 + drivers/net/wireless/mwl8k.c | 2 +- drivers/net/wireless/orinoco/Kconfig | 2 +- drivers/net/wireless/orinoco/airport.c | 2 +- drivers/net/wireless/orinoco/wext.c | 2 +- drivers/net/wireless/p54/fwio.c | 2 +- drivers/net/wireless/p54/main.c | 8 +- drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rndis_wlan.c | 28 +- drivers/net/wireless/rt2x00/rt2800usb.c | 13 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 4 +- drivers/net/wireless/rtlwifi/base.c | 7 +- drivers/net/wireless/rtlwifi/base.h | 10 +- drivers/net/wireless/rtlwifi/cam.h | 2 - drivers/net/wireless/rtlwifi/core.c | 6 +- drivers/net/wireless/rtlwifi/core.h | 2 - drivers/net/wireless/rtlwifi/efuse.h | 6 - drivers/net/wireless/rtlwifi/pci.c | 2 +- drivers/net/wireless/rtlwifi/rc.c | 5 +- drivers/net/wireless/rtlwifi/rtl8188ee/def.h | 41 - drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 7 +- drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 3 +- drivers/net/wireless/rtlwifi/rtl8188ee/rf.h | 1 - drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 41 - drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 1 - drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 11 +- drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 2 - drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 1 - drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 2 + drivers/net/wireless/rtlwifi/rtl8192de/def.h | 39 - drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192ee/rf.h | 1 - drivers/net/wireless/rtlwifi/rtl8192se/def.h | 1 - drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 4 +- drivers/net/wireless/rtlwifi/rtl8723ae/def.h | 41 - drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 4 +- drivers/net/wireless/rtlwifi/rtl8723ae/rf.h | 1 - drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 4 +- drivers/net/wireless/rtlwifi/rtl8723be/rf.h | 1 - drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 41 - drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 8 +- drivers/net/wireless/rtlwifi/rtl8821ae/rf.h | 1 - drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 16 +- drivers/net/wireless/rtlwifi/stats.c | 24 +- drivers/net/wireless/rtlwifi/stats.h | 1 - drivers/net/wireless/rtlwifi/usb.c | 11 +- drivers/net/wireless/ti/wl1251/main.c | 6 +- drivers/net/wireless/ti/wl18xx/debugfs.c | 2 +- drivers/net/wireless/ti/wl18xx/event.c | 4 +- drivers/net/wireless/ti/wlcore/cmd.c | 4 +- drivers/net/wireless/ti/wlcore/debugfs.h | 4 +- drivers/net/xen-netback/common.h | 4 + drivers/net/xen-netback/interface.c | 3 +- drivers/net/xen-netback/netback.c | 4 +- drivers/net/xen-netback/xenbus.c | 57 + drivers/nfc/Kconfig | 1 + drivers/nfc/Makefile | 1 + drivers/nfc/microread/i2c.c | 2 +- drivers/nfc/nfcmrvl/main.c | 4 +- drivers/nfc/nfcmrvl/usb.c | 18 +- drivers/nfc/nxp-nci/Kconfig | 25 + drivers/nfc/nxp-nci/Makefile | 11 + drivers/nfc/nxp-nci/core.c | 186 +++ drivers/nfc/nxp-nci/firmware.c | 325 ++++ drivers/nfc/nxp-nci/i2c.c | 415 +++++ drivers/nfc/nxp-nci/nxp-nci.h | 89 ++ drivers/nfc/pn533.c | 6 +- drivers/nfc/pn544/i2c.c | 7 +- drivers/nfc/port100.c | 36 +- drivers/nfc/st21nfca/st21nfca.c | 4 +- drivers/nfc/st21nfca/st21nfca_se.c | 11 +- drivers/nfc/st21nfcb/i2c.c | 9 +- drivers/nfc/st21nfcb/ndlc.c | 5 +- drivers/nfc/st21nfcb/st21nfcb_se.c | 16 +- drivers/of/of_mdio.c | 3 +- drivers/ptp/ptp_chardev.c | 8 +- drivers/ptp/ptp_clock.c | 12 +- drivers/ptp/ptp_ixp46x.c | 8 +- drivers/ptp/ptp_pch.c | 8 +- drivers/s390/net/Kconfig | 13 +- drivers/s390/net/Makefile | 1 - drivers/s390/net/claw.c | 3377 --------------------------------------- drivers/s390/net/claw.h | 348 ---- drivers/s390/net/qeth_core_main.c | 5 +- drivers/scsi/csiostor/csio_init.c | 2 +- drivers/scsi/sg.c | 2 +- drivers/ssb/driver_pcicore.c | 9 + drivers/ssb/main.c | 2 + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 6 +- drivers/staging/unisys/include/timskmod.h | 1 - drivers/usb/gadget/function/f_fs.c | 6 +- drivers/usb/gadget/legacy/inode.c | 6 +- drivers/vhost/net.c | 10 +- fs/9p/vfs_addr.c | 2 +- fs/affs/file.c | 2 +- fs/afs/misc.c | 16 +- fs/afs/rxrpc.c | 5 +- fs/afs/write.c | 1 - fs/aio.c | 150 +- fs/bfs/inode.c | 1 + fs/block_dev.c | 1 - fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 2 +- fs/ceph/file.c | 3 +- fs/compat_ioctl.c | 2 + fs/direct-io.c | 5 +- fs/ecryptfs/file.c | 7 - fs/ext2/inode.c | 2 +- fs/ext3/inode.c | 2 +- fs/ext4/file.c | 2 +- fs/ext4/indirect.c | 2 +- fs/ext4/inode.c | 1 - fs/ext4/page-io.c | 1 - fs/f2fs/data.c | 2 +- fs/fat/inode.c | 1 - fs/fuse/cuse.c | 2 +- fs/fuse/dev.c | 1 - fs/fuse/file.c | 55 +- fs/fuse/fuse_i.h | 1 + fs/gfs2/aops.c | 2 +- fs/gfs2/file.c | 1 - fs/hfs/inode.c | 2 +- fs/hfsplus/inode.c | 2 +- fs/jfs/inode.c | 2 +- fs/nfs/direct.c | 4 +- fs/nfs/file.c | 1 - fs/nilfs2/inode.c | 2 +- fs/ntfs/file.c | 1 - fs/ntfs/inode.c | 1 - fs/ocfs2/aops.c | 1 + fs/ocfs2/aops.h | 2 +- fs/ocfs2/file.c | 8 +- fs/pipe.c | 1 - fs/read_write.c | 35 +- fs/reiserfs/inode.c | 2 +- fs/splice.c | 1 - fs/ubifs/file.c | 1 - fs/udf/file.c | 4 +- fs/udf/inode.c | 2 +- fs/xfs/xfs_aops.c | 1 - fs/xfs/xfs_file.c | 1 - include/crypto/if_alg.h | 4 +- include/linux/aio.h | 70 +- include/linux/bcma/bcma.h | 21 + include/linux/bcma/bcma_driver_chipcommon.h | 11 - include/linux/bcma/bcma_driver_gmac_cmn.h | 6 - include/linux/bcma/bcma_driver_mips.h | 15 - include/linux/bcma/bcma_driver_pci.h | 12 +- include/linux/bcma/bcma_driver_pcie2.h | 4 +- include/linux/bpf.h | 63 +- include/linux/brcmphy.h | 2 + include/linux/can/dev.h | 2 + include/linux/can/led.h | 6 +- include/linux/can/skb.h | 7 +- include/linux/dccp.h | 4 +- include/linux/etherdevice.h | 1 - include/linux/filter.h | 7 +- include/linux/fs.h | 22 + include/linux/ieee802154.h | 14 +- include/linux/if_bridge.h | 1 + include/linux/if_link.h | 1 + include/linux/if_pppox.h | 2 + include/linux/if_vlan.h | 67 + include/linux/inet_diag.h | 43 +- include/linux/ipv6.h | 4 + include/linux/jhash.h | 17 +- include/linux/mlx4/cmd.h | 26 +- include/linux/mlx4/device.h | 40 +- include/linux/mlx4/qp.h | 18 +- include/linux/mlx5/cmd.h | 2 +- include/linux/mlx5/cq.h | 7 +- include/linux/mlx5/device.h | 2 +- include/linux/mlx5/doorbell.h | 2 +- include/linux/mlx5/driver.h | 16 +- include/linux/mlx5/mlx5_ifc.h | 2 +- include/linux/mlx5/qp.h | 2 +- include/linux/mlx5/srq.h | 2 +- include/linux/mmc/sdio_ids.h | 2 + include/linux/net.h | 12 +- include/linux/netdevice.h | 140 +- include/linux/netfilter.h | 103 +- include/linux/netfilter/ipset/ip_set.h | 5 +- include/linux/netfilter_arp/arp_tables.h | 3 +- include/linux/netfilter_bridge.h | 100 +- include/linux/netfilter_bridge/ebtables.h | 3 +- include/linux/netfilter_ipv4/ip_tables.h | 3 +- include/linux/netfilter_ipv6/ip6_tables.h | 3 +- include/linux/netlink.h | 2 +- include/linux/of_mdio.h | 7 + include/linux/of_net.h | 8 + include/linux/phy_fixed.h | 9 + include/linux/platform_data/nxp-nci.h | 27 + include/linux/ptp_clock_kernel.h | 12 +- include/linux/rhashtable.h | 527 +++++- include/linux/rtnetlink.h | 15 +- include/linux/security.h | 8 - include/linux/skbuff.h | 13 +- include/linux/sock_diag.h | 4 +- include/linux/socket.h | 8 + include/linux/spi/at86rf230.h | 1 + include/linux/spi/cc2520.h | 1 + include/linux/tcp.h | 5 +- include/linux/udp.h | 2 +- include/linux/uio.h | 14 + include/net/af_vsock.h | 4 +- include/net/arp.h | 20 +- include/net/ax25.h | 5 +- include/net/bluetooth/bluetooth.h | 45 +- include/net/bluetooth/hci.h | 59 +- include/net/bluetooth/hci_core.h | 233 +-- include/net/bluetooth/mgmt.h | 101 +- include/net/bond_3ad.h | 29 + include/net/cfg80211.h | 127 +- include/net/compat.h | 2 +- include/net/dcbnl.h | 3 + include/net/dn_neigh.h | 5 +- include/net/dsa.h | 27 + include/net/dst_ops.h | 1 - include/net/fib_rules.h | 11 +- include/net/genetlink.h | 4 +- include/net/if_inet6.h | 4 +- include/net/inet6_connection_sock.h | 3 +- include/net/inet6_hashtables.h | 2 - include/net/inet_common.h | 7 +- include/net/inet_connection_sock.h | 28 +- include/net/inet_hashtables.h | 36 +- include/net/inet_sock.h | 30 +- include/net/inet_timewait_sock.h | 108 +- include/net/inetpeer.h | 3 +- include/net/ip.h | 15 +- include/net/ip6_route.h | 3 +- include/net/ip6_tunnel.h | 6 +- include/net/ip_fib.h | 70 +- include/net/ip_tunnels.h | 1 + include/net/ip_vs.h | 69 +- include/net/ipv6.h | 14 +- include/net/iw_handler.h | 22 + include/net/mac80211.h | 251 ++- include/net/mac802154.h | 13 +- include/net/ndisc.h | 19 +- include/net/neighbour.h | 67 +- include/net/net_namespace.h | 58 +- include/net/netfilter/ipv4/nf_reject.h | 8 +- include/net/netfilter/ipv6/nf_reject.h | 13 +- include/net/netfilter/nf_conntrack.h | 5 +- include/net/netfilter/nf_nat_l3proto.h | 48 +- include/net/netfilter/nf_queue.h | 6 +- include/net/netfilter/nf_tables.h | 621 ++++++-- include/net/netfilter/nf_tables_core.h | 3 + include/net/netfilter/nf_tables_ipv4.h | 5 +- include/net/netfilter/nf_tables_ipv6.h | 5 +- include/net/netfilter/nft_meta.h | 4 +- include/net/netlink.h | 50 + include/net/netns/hash.h | 4 +- include/net/netns/ipv4.h | 13 +- include/net/netns/ipv6.h | 3 + include/net/netns/mpls.h | 17 + include/net/netns/x_tables.h | 1 + include/net/nfc/hci.h | 4 + include/net/nfc/nci_core.h | 5 + include/net/nfc/nfc.h | 2 +- include/net/ping.h | 7 +- include/net/request_sock.h | 140 +- include/net/rtnetlink.h | 2 +- include/net/sch_generic.h | 4 +- include/net/sctp/sctp.h | 3 + include/net/sock.h | 64 +- include/net/switchdev.h | 55 + include/net/tc_act/tc_bpf.h | 6 +- include/net/tcp.h | 122 +- include/net/tcp_states.h | 4 +- include/net/udp.h | 24 +- include/net/udp_tunnel.h | 5 +- include/net/vxlan.h | 4 +- include/net/xfrm.h | 22 +- include/rxrpc/packet.h | 3 +- include/uapi/linux/bpf.h | 58 + include/uapi/linux/can/raw.h | 1 + include/uapi/linux/dcbnl.h | 66 + include/uapi/linux/filter.h | 3 +- include/uapi/linux/fou.h | 1 + include/uapi/linux/if_addr.h | 2 + include/uapi/linux/if_link.h | 14 + include/uapi/linux/if_packet.h | 1 + include/uapi/linux/ip_vs.h | 7 +- include/uapi/linux/ipv6.h | 1 + include/uapi/linux/neighbour.h | 1 + include/uapi/linux/netfilter/nf_tables.h | 80 +- include/uapi/linux/netfilter_bridge/ebtables.h | 2 - include/uapi/linux/nl80211.h | 34 +- include/uapi/linux/pkt_cls.h | 2 + include/uapi/linux/rtnetlink.h | 16 + include/uapi/linux/tc_act/tc_bpf.h | 2 + include/uapi/linux/tipc_netlink.h | 9 + include/uapi/linux/xfrm.h | 2 + kernel/bpf/Makefile | 3 - kernel/bpf/arraymap.c | 6 +- kernel/bpf/core.c | 8 + kernel/bpf/hashtab.c | 6 +- kernel/bpf/helpers.c | 30 +- kernel/bpf/syscall.c | 11 +- kernel/bpf/test_stub.c | 78 - kernel/bpf/verifier.c | 177 ++- kernel/printk/printk.c | 4 +- kernel/sysctl.c | 1 + lib/iov_iter.c | 57 + lib/rhashtable.c | 1022 +++++------- lib/sha1.c | 1 + lib/test_rhashtable.c | 58 +- mm/filemap.c | 1 - mm/page_io.c | 3 +- mm/shmem.c | 2 +- net/6lowpan/Kconfig | 57 +- net/6lowpan/Makefile | 13 +- net/6lowpan/iphc.c | 200 +-- net/6lowpan/nhc.c | 241 +++ net/6lowpan/nhc.h | 146 ++ net/6lowpan/nhc_dest.c | 28 + net/6lowpan/nhc_fragment.c | 27 + net/6lowpan/nhc_hop.c | 27 + net/6lowpan/nhc_ipv6.c | 27 + net/6lowpan/nhc_mobility.c | 27 + net/6lowpan/nhc_routing.c | 27 + net/6lowpan/nhc_udp.c | 157 ++ net/802/fc.c | 21 - net/802/fddi.c | 26 - net/802/hippi.c | 28 - net/8021q/vlan.c | 16 +- net/8021q/vlan_dev.c | 47 +- net/9p/trans_fd.c | 4 +- net/Makefile | 2 +- net/appletalk/aarp.c | 6 +- net/appletalk/ddp.c | 7 +- net/atm/common.c | 7 +- net/atm/common.h | 7 +- net/atm/lec.c | 4 +- net/atm/signaling.c | 24 - net/ax25/af_ax25.c | 7 +- net/ax25/ax25_ip.c | 30 +- net/batman-adv/gateway_client.c | 19 +- net/batman-adv/hard-interface.c | 5 +- net/bluetooth/Kconfig | 8 + net/bluetooth/Makefile | 3 +- net/bluetooth/a2mp.c | 44 +- net/bluetooth/a2mp.h | 8 - net/bluetooth/af_bluetooth.c | 20 +- net/bluetooth/bnep/bnep.h | 4 + net/bluetooth/bnep/core.c | 70 +- net/bluetooth/bnep/netdev.c | 2 +- net/bluetooth/bnep/sock.c | 7 + net/bluetooth/cmtp/capi.c | 2 +- net/bluetooth/cmtp/core.c | 15 +- net/bluetooth/hci_conn.c | 34 +- net/bluetooth/hci_core.c | 578 +++---- net/bluetooth/hci_debugfs.c | 98 +- net/bluetooth/hci_debugfs.h | 22 + net/bluetooth/hci_event.c | 517 ++++-- net/bluetooth/hci_request.c | 48 +- net/bluetooth/hci_request.h | 5 +- net/bluetooth/hci_sock.c | 329 +++- net/bluetooth/hidp/core.c | 15 +- net/bluetooth/l2cap_core.c | 98 +- net/bluetooth/l2cap_sock.c | 18 +- net/bluetooth/mgmt.c | 3796 +++++++++++++++++++++++++++----------------- net/bluetooth/mgmt_util.c | 210 +++ net/bluetooth/mgmt_util.h | 53 + net/bluetooth/rfcomm/sock.c | 10 +- net/bluetooth/sco.c | 33 +- net/bluetooth/selftest.c | 35 +- net/bluetooth/smp.c | 415 +++-- net/bluetooth/smp.h | 1 + net/bridge/br_device.c | 10 +- net/bridge/br_forward.c | 20 +- net/bridge/br_input.c | 33 +- net/bridge/br_multicast.c | 3 +- net/bridge/br_netfilter.c | 319 ++-- net/bridge/br_netlink.c | 131 +- net/bridge/br_nf_core.c | 1 - net/bridge/br_private.h | 12 +- net/bridge/br_stp_bpdu.c | 5 +- net/bridge/br_sysfs_if.c | 2 + net/bridge/netfilter/ebtable_filter.c | 14 +- net/bridge/netfilter/ebtable_nat.c | 14 +- net/bridge/netfilter/nf_tables_bridge.c | 28 +- net/bridge/netfilter/nft_meta_bridge.c | 26 +- net/bridge/netfilter/nft_reject_bridge.c | 92 +- net/caif/caif_socket.c | 17 +- net/can/bcm.c | 9 +- net/can/raw.c | 63 +- net/compat.c | 30 +- net/core/datagram.c | 2 +- net/core/dev.c | 150 +- net/core/ethtool.c | 2 +- net/core/fib_rules.c | 25 +- net/core/filter.c | 460 +++++- net/core/link_watch.c | 4 +- net/core/neighbour.c | 112 +- net/core/net-sysfs.c | 125 +- net/core/net_namespace.c | 114 +- net/core/request_sock.c | 45 +- net/core/rtnetlink.c | 121 +- net/core/skbuff.c | 55 +- net/core/sock.c | 109 +- net/core/sock_diag.c | 37 +- net/core/sysctl_net_core.c | 2 - net/dcb/dcbnl.c | 44 +- net/dccp/dccp.h | 12 +- net/dccp/diag.c | 7 +- net/dccp/ipv4.c | 99 +- net/dccp/ipv6.c | 86 +- net/dccp/minisocks.c | 26 +- net/dccp/probe.c | 3 +- net/dccp/proto.c | 7 +- net/dccp/timer.c | 24 +- net/decnet/af_decnet.c | 7 +- net/decnet/dn_neigh.c | 137 +- net/decnet/dn_nsp_in.c | 5 +- net/decnet/dn_route.c | 36 +- net/decnet/netfilter/dn_rtmsg.c | 4 +- net/dsa/Kconfig | 7 +- net/dsa/dsa.c | 251 +-- net/dsa/dsa_priv.h | 9 +- net/dsa/slave.c | 327 +++- net/ethernet/eth.c | 38 +- net/ieee802154/6lowpan/core.c | 8 +- net/ieee802154/core.c | 6 +- net/ieee802154/nl-mac.c | 1 - net/ieee802154/socket.c | 21 +- net/ieee802154/sysfs.c | 49 - net/ipv4/af_inet.c | 21 +- net/ipv4/arp.c | 150 +- net/ipv4/cipso_ipv4.c | 42 +- net/ipv4/devinet.c | 91 +- net/ipv4/esp4.c | 2 +- net/ipv4/fib_frontend.c | 134 +- net/ipv4/fib_lookup.h | 4 +- net/ipv4/fib_rules.c | 39 +- net/ipv4/fib_semantics.c | 43 +- net/ipv4/fib_trie.c | 1767 +++++++++++---------- net/ipv4/fou.c | 234 ++- net/ipv4/geneve.c | 14 +- net/ipv4/gre_offload.c | 4 +- net/ipv4/icmp.c | 6 +- net/ipv4/igmp.c | 72 +- net/ipv4/inet_connection_sock.c | 197 +-- net/ipv4/inet_diag.c | 434 +++-- net/ipv4/inet_fragment.c | 4 +- net/ipv4/inet_hashtables.c | 72 +- net/ipv4/inet_timewait_sock.c | 277 +--- net/ipv4/ip_forward.c | 8 +- net/ipv4/ip_fragment.c | 14 +- net/ipv4/ip_gre.c | 14 +- net/ipv4/ip_input.c | 17 +- net/ipv4/ip_options.c | 2 +- net/ipv4/ip_output.c | 89 +- net/ipv4/ip_sockglue.c | 34 +- net/ipv4/ip_tunnel.c | 21 +- net/ipv4/ip_tunnel_core.c | 3 +- net/ipv4/ip_vti.c | 12 +- net/ipv4/ipcomp.c | 2 +- net/ipv4/ipconfig.c | 6 +- net/ipv4/ipip.c | 12 +- net/ipv4/ipmr.c | 81 +- net/ipv4/netfilter.c | 4 +- net/ipv4/netfilter/Kconfig | 38 +- net/ipv4/netfilter/arp_tables.c | 11 +- net/ipv4/netfilter/arptable_filter.c | 7 +- net/ipv4/netfilter/ip_tables.c | 13 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 17 +- net/ipv4/netfilter/ipt_REJECT.c | 17 +- net/ipv4/netfilter/ipt_SYNPROXY.c | 6 +- net/ipv4/netfilter/iptable_filter.c | 8 +- net/ipv4/netfilter/iptable_mangle.c | 19 +- net/ipv4/netfilter/iptable_nat.c | 29 +- net/ipv4/netfilter/iptable_raw.c | 7 +- net/ipv4/netfilter/iptable_security.c | 8 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 28 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +- net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +- net/ipv4/netfilter/nf_log_arp.c | 4 +- net/ipv4/netfilter/nf_log_ipv4.c | 4 +- net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 33 +- net/ipv4/netfilter/nf_reject_ipv4.c | 29 +- net/ipv4/netfilter/nf_tables_arp.c | 6 +- net/ipv4/netfilter/nf_tables_ipv4.c | 12 +- net/ipv4/netfilter/nft_chain_nat_ipv4.c | 29 +- net/ipv4/netfilter/nft_chain_route_ipv4.c | 6 +- net/ipv4/netfilter/nft_masq_ipv4.c | 9 +- net/ipv4/netfilter/nft_redir_ipv4.c | 11 +- net/ipv4/netfilter/nft_reject_ipv4.c | 9 +- net/ipv4/ping.c | 17 +- net/ipv4/proc.c | 2 +- net/ipv4/raw.c | 20 +- net/ipv4/route.c | 40 +- net/ipv4/syncookies.c | 24 +- net/ipv4/sysctl_net_ipv4.c | 20 +- net/ipv4/tcp.c | 57 +- net/ipv4/tcp_cong.c | 2 +- net/ipv4/tcp_diag.c | 6 +- net/ipv4/tcp_fastopen.c | 20 +- net/ipv4/tcp_input.c | 218 ++- net/ipv4/tcp_ipv4.c | 223 +-- net/ipv4/tcp_metrics.c | 208 +-- net/ipv4/tcp_minisocks.c | 61 +- net/ipv4/tcp_offload.c | 4 +- net/ipv4/tcp_output.c | 177 ++- net/ipv4/tcp_timer.c | 21 +- net/ipv4/udp.c | 44 +- net/ipv4/udp_diag.c | 24 +- net/ipv4/udp_impl.h | 4 +- net/ipv4/udp_offload.c | 4 +- net/ipv4/udp_tunnel.c | 4 +- net/ipv4/xfrm4_input.c | 7 +- net/ipv4/xfrm4_mode_tunnel.c | 2 +- net/ipv4/xfrm4_output.c | 12 +- net/ipv4/xfrm4_policy.c | 3 +- net/ipv6/addrconf.c | 433 ++++- net/ipv6/addrconf_core.c | 2 +- net/ipv6/addrlabel.c | 13 +- net/ipv6/af_inet6.c | 18 +- net/ipv6/ah6.c | 2 +- net/ipv6/anycast.c | 22 +- net/ipv6/datagram.c | 6 +- net/ipv6/esp6.c | 2 +- net/ipv6/exthdrs_core.c | 10 +- net/ipv6/fib6_rules.c | 21 +- net/ipv6/icmp.c | 13 +- net/ipv6/inet6_connection_sock.c | 23 +- net/ipv6/inet6_hashtables.c | 60 +- net/ipv6/ip6_fib.c | 4 +- net/ipv6/ip6_flowlabel.c | 25 +- net/ipv6/ip6_gre.c | 34 +- net/ipv6/ip6_input.c | 13 +- net/ipv6/ip6_offload.c | 2 +- net/ipv6/ip6_output.c | 63 +- net/ipv6/ip6_tunnel.c | 42 +- net/ipv6/ip6_udp_tunnel.c | 5 +- net/ipv6/ip6_vti.c | 30 +- net/ipv6/ip6mr.c | 74 +- net/ipv6/ipv6_sockglue.c | 42 +- net/ipv6/mcast.c | 75 +- net/ipv6/ndisc.c | 36 +- net/ipv6/netfilter.c | 4 +- net/ipv6/netfilter/Kconfig | 18 +- net/ipv6/netfilter/ip6_tables.c | 18 +- net/ipv6/netfilter/ip6t_REJECT.c | 3 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 6 +- net/ipv6/netfilter/ip6table_filter.c | 8 +- net/ipv6/netfilter/ip6table_mangle.c | 19 +- net/ipv6/netfilter/ip6table_nat.c | 29 +- net/ipv6/netfilter/ip6table_raw.c | 8 +- net/ipv6/netfilter/ip6table_security.c | 8 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 32 +- net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 10 +- net/ipv6/netfilter/nf_log_ipv6.c | 4 +- net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 32 +- net/ipv6/netfilter/nf_reject_ipv6.c | 41 +- net/ipv6/netfilter/nf_tables_ipv6.c | 12 +- net/ipv6/netfilter/nft_chain_nat_ipv6.c | 29 +- net/ipv6/netfilter/nft_chain_route_ipv6.c | 6 +- net/ipv6/netfilter/nft_masq_ipv6.c | 7 +- net/ipv6/netfilter/nft_redir_ipv6.c | 11 +- net/ipv6/netfilter/nft_reject_ipv6.c | 6 +- net/ipv6/output_core.c | 37 +- net/ipv6/ping.c | 3 +- net/ipv6/raw.c | 28 +- net/ipv6/reassembly.c | 8 +- net/ipv6/route.c | 40 +- net/ipv6/sit.c | 42 +- net/ipv6/syncookies.c | 12 +- net/ipv6/sysctl_net_ipv6.c | 18 +- net/ipv6/tcp_ipv6.c | 169 +- net/ipv6/tcpv6_offload.c | 4 +- net/ipv6/udp.c | 43 +- net/ipv6/udp_impl.h | 7 +- net/ipv6/udp_offload.c | 4 +- net/ipv6/xfrm6_input.c | 3 +- net/ipv6/xfrm6_mode_beet.c | 4 +- net/ipv6/xfrm6_output.c | 15 +- net/ipv6/xfrm6_policy.c | 7 +- net/ipx/af_ipx.c | 7 +- net/irda/af_irda.c | 29 +- net/iucv/af_iucv.c | 8 +- net/key/af_key.c | 8 +- net/l2tp/l2tp_eth.c | 2 +- net/l2tp/l2tp_ip.c | 4 +- net/l2tp/l2tp_ip6.c | 8 +- net/l2tp/l2tp_netlink.c | 18 +- net/l2tp/l2tp_ppp.c | 7 +- net/llc/af_llc.c | 7 +- net/mac80211/aes_ccm.c | 12 +- net/mac80211/aes_gcm.c | 12 +- net/mac80211/aes_gmac.c | 4 +- net/mac80211/agg-rx.c | 8 + net/mac80211/agg-tx.c | 58 +- net/mac80211/cfg.c | 99 +- net/mac80211/debugfs.c | 170 -- net/mac80211/debugfs_netdev.c | 2 - net/mac80211/debugfs_sta.c | 134 -- net/mac80211/driver-ops.h | 24 +- net/mac80211/ht.c | 2 - net/mac80211/ibss.c | 343 ++-- net/mac80211/ieee80211_i.h | 67 +- net/mac80211/iface.c | 27 +- net/mac80211/key.c | 1 + net/mac80211/key.h | 2 + net/mac80211/main.c | 16 +- net/mac80211/mesh.c | 5 +- net/mac80211/mesh_plink.c | 10 +- net/mac80211/mlme.c | 236 ++- net/mac80211/pm.c | 28 +- net/mac80211/rc80211_minstrel.c | 125 +- net/mac80211/rc80211_minstrel.h | 49 +- net/mac80211/rc80211_minstrel_debugfs.c | 125 +- net/mac80211/rc80211_minstrel_ht.c | 223 ++- net/mac80211/rc80211_minstrel_ht.h | 5 +- net/mac80211/rc80211_minstrel_ht_debugfs.c | 216 ++- net/mac80211/rx.c | 39 +- net/mac80211/scan.c | 25 +- net/mac80211/sta_info.c | 226 +-- net/mac80211/sta_info.h | 62 +- net/mac80211/status.c | 82 +- net/mac80211/tdls.c | 155 +- net/mac80211/trace.h | 45 +- net/mac80211/tx.c | 381 +++-- net/mac80211/util.c | 190 ++- net/mac80211/vht.c | 4 - net/mac80211/wpa.c | 13 +- net/mac802154/driver-ops.h | 4 +- net/mac802154/iface.c | 20 +- net/mac802154/util.c | 13 +- net/mpls/Kconfig | 21 + net/mpls/Makefile | 3 + net/mpls/af_mpls.c | 1023 ++++++++++++ net/mpls/internal.h | 59 + net/netfilter/Kconfig | 23 +- net/netfilter/Makefile | 2 +- net/netfilter/core.c | 31 +- net/netfilter/ipset/ip_set_hash_netiface.c | 32 +- net/netfilter/ipvs/ip_vs_core.c | 101 +- net/netfilter/ipvs/ip_vs_ctl.c | 182 ++- net/netfilter/ipvs/ip_vs_est.c | 102 +- net/netfilter/ipvs/ip_vs_sync.c | 23 +- net/netfilter/ipvs/ip_vs_xmit.c | 15 +- net/netfilter/nf_conntrack_acct.c | 8 +- net/netfilter/nf_conntrack_amanda.c | 10 +- net/netfilter/nf_conntrack_expect.c | 4 +- net/netfilter/nf_internals.h | 11 +- net/netfilter/nf_log_common.c | 7 +- net/netfilter/nf_queue.c | 76 +- net/netfilter/nf_tables_api.c | 636 ++++++-- net/netfilter/nf_tables_core.c | 161 +- net/netfilter/nfnetlink_log.c | 35 +- net/netfilter/nfnetlink_queue_core.c | 69 +- net/netfilter/nft_bitwise.c | 37 +- net/netfilter/nft_byteorder.c | 40 +- net/netfilter/nft_cmp.c | 44 +- net/netfilter/nft_compat.c | 41 +- net/netfilter/nft_counter.c | 3 +- net/netfilter/nft_ct.c | 118 +- net/netfilter/nft_dynset.c | 265 ++++ net/netfilter/nft_expr_template.c | 94 -- net/netfilter/nft_exthdr.c | 23 +- net/netfilter/nft_hash.c | 327 ++-- net/netfilter/nft_immediate.c | 18 +- net/netfilter/nft_limit.c | 5 +- net/netfilter/nft_log.c | 4 +- net/netfilter/nft_lookup.c | 35 +- net/netfilter/nft_meta.c | 116 +- net/netfilter/nft_nat.c | 71 +- net/netfilter/nft_payload.c | 24 +- net/netfilter/nft_queue.c | 4 +- net/netfilter/nft_rbtree.c | 132 +- net/netfilter/nft_redir.c | 19 +- net/netfilter/nft_reject_inet.c | 11 +- net/netfilter/xt_TPROXY.c | 22 +- net/netfilter/xt_cgroup.c | 2 +- net/netfilter/xt_physdev.c | 35 +- net/netfilter/xt_set.c | 4 +- net/netfilter/xt_socket.c | 129 +- net/netfilter/xt_string.c | 3 +- net/netlabel/netlabel_mgmt.c | 20 +- net/netlabel/netlabel_unlabeled.c | 28 +- net/netlink/af_netlink.c | 95 +- net/netrom/af_netrom.c | 7 +- net/netrom/nr_dev.c | 31 - net/nfc/llcp_sock.c | 8 +- net/nfc/nci/core.c | 11 + net/nfc/netlink.c | 2 +- net/nfc/rawsock.c | 7 +- net/openvswitch/Kconfig | 1 + net/openvswitch/datapath.c | 4 +- net/openvswitch/datapath.h | 4 +- net/openvswitch/flow_netlink.c | 10 +- net/openvswitch/vport-vxlan.c | 5 +- net/packet/af_packet.c | 62 +- net/packet/internal.h | 4 +- net/phonet/datagram.c | 8 +- net/phonet/pep.c | 8 +- net/phonet/socket.c | 6 +- net/rds/connection.c | 3 +- net/rds/rds.h | 8 +- net/rds/recv.c | 4 +- net/rds/send.c | 36 +- net/rose/af_rose.c | 7 +- net/rose/rose_dev.c | 53 +- net/rxrpc/af_rxrpc.c | 7 +- net/rxrpc/ar-input.c | 23 +- net/rxrpc/ar-internal.h | 12 +- net/rxrpc/ar-local.c | 98 ++ net/rxrpc/ar-output.c | 73 +- net/rxrpc/ar-recvmsg.c | 6 +- net/sched/act_bpf.c | 295 +++- net/sched/cls_api.c | 14 +- net/sched/cls_basic.c | 6 +- net/sched/cls_bpf.c | 221 ++- net/sched/cls_cgroup.c | 6 +- net/sched/cls_flow.c | 6 +- net/sched/cls_fw.c | 34 +- net/sched/cls_route.c | 26 +- net/sched/cls_rsvp.h | 12 +- net/sched/cls_tcindex.c | 6 +- net/sched/cls_u32.c | 25 +- net/sched/em_text.c | 3 +- net/sched/sch_api.c | 14 +- net/sched/sch_fq.c | 4 +- net/sched/sch_ingress.c | 9 + net/sched/sch_netem.c | 3 +- net/sctp/protocol.c | 3 +- net/sctp/socket.c | 13 +- net/sctp/sysctl.c | 4 - net/socket.c | 176 +- net/sunrpc/svcsock.c | 2 +- net/switchdev/switchdev.c | 217 ++- net/tipc/Kconfig | 8 + net/tipc/Makefile | 1 + net/tipc/addr.c | 7 + net/tipc/addr.h | 1 + net/tipc/bcast.c | 95 +- net/tipc/bcast.h | 4 - net/tipc/bearer.c | 13 +- net/tipc/bearer.h | 17 +- net/tipc/discover.c | 11 +- net/tipc/eth_media.c | 8 +- net/tipc/ib_media.c | 2 +- net/tipc/link.c | 862 ++++------ net/tipc/link.h | 51 +- net/tipc/msg.c | 130 +- net/tipc/msg.h | 133 +- net/tipc/name_distr.c | 4 +- net/tipc/name_table.c | 4 +- net/tipc/node.c | 116 +- net/tipc/node.h | 18 +- net/tipc/server.c | 47 +- net/tipc/socket.c | 272 ++-- net/tipc/socket.h | 4 - net/tipc/subscr.c | 23 +- net/tipc/udp_media.c | 448 ++++++ net/unix/af_unix.c | 50 +- net/vmw_vsock/af_vsock.c | 20 +- net/vmw_vsock/vmci_transport.c | 3 +- net/wireless/Kconfig | 10 +- net/wireless/ibss.c | 4 +- net/wireless/mlme.c | 6 +- net/wireless/nl80211.c | 98 +- net/wireless/rdev-ops.h | 5 +- net/wireless/reg.c | 145 +- net/wireless/reg.h | 24 +- net/wireless/scan.c | 302 +++- net/wireless/sme.c | 90 +- net/wireless/trace.h | 41 +- net/wireless/util.c | 171 ++ net/wireless/wext-compat.c | 18 +- net/wireless/wext-compat.h | 6 + net/wireless/wext-sme.c | 2 +- net/x25/af_x25.c | 6 +- net/xfrm/xfrm_input.c | 10 +- net/xfrm/xfrm_output.c | 16 +- net/xfrm/xfrm_state.c | 8 +- net/xfrm/xfrm_user.c | 5 + samples/bpf/Makefile | 1 + samples/bpf/bpf_helpers.h | 7 + samples/bpf/libbpf.h | 4 +- samples/bpf/sockex1_kern.c | 8 +- samples/bpf/sockex1_user.c | 2 +- samples/bpf/sockex2_kern.c | 26 +- samples/bpf/sockex2_user.c | 11 +- samples/bpf/tcbpf1_kern.c | 71 + samples/bpf/test_verifier.c | 84 +- samples/pktgen/pktgen.conf-1-1 | 59 + samples/pktgen/pktgen.conf-1-1-flows | 67 + samples/pktgen/pktgen.conf-1-1-ip6 | 60 + samples/pktgen/pktgen.conf-1-1-ip6-rdos | 63 + samples/pktgen/pktgen.conf-1-1-rdos | 64 + samples/pktgen/pktgen.conf-1-2 | 69 + samples/pktgen/pktgen.conf-2-1 | 66 + samples/pktgen/pktgen.conf-2-2 | 73 + security/capability.c | 6 - security/security.c | 5 - security/selinux/hooks.c | 35 +- security/selinux/nlmsgtab.c | 13 + security/smack/smack_netfilter.c | 8 +- sound/core/pcm_native.c | 2 +- tools/net/bpf_exp.l | 6 +- tools/net/bpf_exp.y | 23 +- 1517 files changed, 55672 insertions(+), 32602 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/nfc/nxp-nci.txt create mode 100644 Documentation/networking/mpls-sysctl.txt rename arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} (76%) create mode 100644 drivers/bluetooth/btbcm.c create mode 100644 drivers/bluetooth/btbcm.h create mode 100644 drivers/bluetooth/btintel.c create mode 100644 drivers/bluetooth/btintel.h create mode 100644 drivers/bluetooth/hci_bcm.c create mode 100644 drivers/bluetooth/hci_intel.c delete mode 100644 drivers/net/ethernet/cadence/at91_ether.c create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.h create mode 100644 drivers/net/ethernet/mellanox/mlx4/fw_qos.c create mode 100644 drivers/net/ethernet/mellanox/mlx4/fw_qos.h create mode 100644 drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_aic.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_aic.h create mode 100644 drivers/net/wireless/ath/ath9k/reg_aic.h create mode 100644 drivers/net/wireless/ath/ath9k/reg_mci.h create mode 100644 drivers/nfc/nxp-nci/Kconfig create mode 100644 drivers/nfc/nxp-nci/Makefile create mode 100644 drivers/nfc/nxp-nci/core.c create mode 100644 drivers/nfc/nxp-nci/firmware.c create mode 100644 drivers/nfc/nxp-nci/i2c.c create mode 100644 drivers/nfc/nxp-nci/nxp-nci.h delete mode 100644 drivers/s390/net/claw.c delete mode 100644 drivers/s390/net/claw.h create mode 100644 include/linux/platform_data/nxp-nci.h create mode 100644 include/net/netns/mpls.h delete mode 100644 kernel/bpf/test_stub.c create mode 100644 net/6lowpan/nhc.c create mode 100644 net/6lowpan/nhc.h create mode 100644 net/6lowpan/nhc_dest.c create mode 100644 net/6lowpan/nhc_fragment.c create mode 100644 net/6lowpan/nhc_hop.c create mode 100644 net/6lowpan/nhc_ipv6.c create mode 100644 net/6lowpan/nhc_mobility.c create mode 100644 net/6lowpan/nhc_routing.c create mode 100644 net/6lowpan/nhc_udp.c create mode 100644 net/bluetooth/mgmt_util.c create mode 100644 net/bluetooth/mgmt_util.h create mode 100644 net/mpls/af_mpls.c create mode 100644 net/mpls/internal.h create mode 100644 net/netfilter/nft_dynset.c delete mode 100644 net/netfilter/nft_expr_template.c create mode 100644 net/tipc/udp_media.c create mode 100644 samples/bpf/tcbpf1_kern.c create mode 100755 samples/pktgen/pktgen.conf-1-1 create mode 100755 samples/pktgen/pktgen.conf-1-1-flows create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6 create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6-rdos create mode 100755 samples/pktgen/pktgen.conf-1-1-rdos create mode 100755 samples/pktgen/pktgen.conf-1-2 create mode 100755 samples/pktgen/pktgen.conf-2-1 create mode 100755 samples/pktgen/pktgen.conf-2-2 {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I