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 <asm/uaccess>" with "#include <linux/uaccess>"
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