1) Don't leak ipvs->sysctl_tbl, from Tommi Rentala.
2) Fix neighbour table entry leak in rocker driver, from Ying Xue.
3) Do not emit bonding notifications for unregistered interfaces, from
Nicolas Dichtel.
4) Set ipv6 flow label properly when in TIME_WAIT state, from Florent
Fourcot.
5) Fix regression in ipv6 multicast filter test, from Henning Rogge.
6) do_replace() in various footables netfilter modules is missing
a check for 0 counters in the datastructure provided by the
user. Fix from Dave Jones, and found with trinity.
7) Fix RCU bug in packet scheduler classifier module unloads, from
Daniel Borkmann.
8) Avoid deadlock in tcp_get_info() by using u64_sync. From Eric
Dumzaet.
9) Input packet processing can race with inetdev_destroy() teardown,
fix potential OOPS in ip_error() by explicitly testing whether
the inetdev is still attached. From Eric W. Biederman.
10) MLDv2 parser in bridge multicast code breaks too early while
parsing. Fix from Thadeu Lima de Souza Cascardo.
11) Asking for settings on non-zero PHYID doesn't work because we
do not import the command structure from the user and use the
PHYID provided there. Fix from Arun Parameswaran.
12) Fix UDP checksums with IPV6 RAW sockets, from Vlad Yasevich.
13) Missing NF_TABLES depends for TPROXY etc. can cause build failures,
fix from Florian Westphal.
14) Fix netfilter conntrack to handle RFC5961 challenge ACKs properly,
from Jesper Dangaard Brouer.
15) If netlink autobind retry fails, we have to reset the sockets portid
back to zero. From Herbert Xu.
16) VXLAN netns exit code unregisters using wrong device, from John
W. Linville.
17) Add some USB device IDs to ath3k and btusb bluetooth drivers, from
Dmitry Tunin and Wen-chien Jesse Sung.
Please pull, thanks a lot!
The following changes since commit 110bc76729d448fdbcb5cdb63b83d9fd65ce5e26:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2015-05-12
21:10:38 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
for you to fetch changes up to 93a33a584e2a49a217118148125944fd02d47b54:
bridge: fix lockdep splat (2015-05-22 16:23:56 -0400)
----------------------------------------------------------------
Arun Parameswaran (1):
net: core: 'ethtool' issue with querying phy settings
Bjorn Helgaas (1):
net/mlx4: Avoid 'may be used uninitialized' warnings
Bjørn Mork (1):
cdc_ncm: Fix tx_bytes statistics
Daniel Borkmann (1):
net: sched: fix call_rcu() race on classifier module unloads
Dave Jones (1):
netfilter: ensure number of counters is >0 in do_replace()
David S. Miller (5):
Merge git://git.kernel.org/.../pablo/nf
Merge branch 'for-upstream' of
git://git.kernel.org/.../bluetooth/bluetooth
Merge tag 'mac80211-for-davem-2015-05-19' of
git://git.kernel.org/.../jberg/mac80211
Merge branch 'ipv6_ecmp_fixes'
Merge git://git.kernel.org/.../pablo/nf
Dmitry Tunin (1):
Bluetooth: ath3k: add support of 04ca:300f AR3012 device
Eric Dumazet (4):
netlink: move nl_table in read_mostly section
inet: properly align icsk_ca_priv
tcp: fix a potential deadlock in tcp_get_info()
bridge: fix lockdep splat
Eric W. Biederman (1):
ipv4: Avoid crashing in ip_error
Florent Fourcot (1):
tcp/ipv6: fix flow label setting in TIME_WAIT state
Florian Fainelli (1):
net: phy: Allow EEE for all RGMII variants
Florian Westphal (2):
netfilter: avoid build error if TPROXY/SOCKET=y && NF_DEFRAG_IPV6=m
Revert "netfilter: bridge: query conntrack about skb dnat"
Francesco Ruggeri (1):
netfilter: nfnetlink_{log,queue}: Register pernet in first place
Henning Rogge (1):
net/ipv6/udp: Fix ipv6 multicast socket filter regression
Herbert Xu (2):
netlink: Reset portid after netlink_insert failure
rhashtable: Add cap on number of elements in hash table
Janusz Dziedzic (1):
mac80211: move WEP tailroom size check
Jesper Dangaard Brouer (1):
conntrack: RFC5961 challenge ACK confuse conntrack LAST-ACK transition
John W. Linville (1):
vxlan: correct typo in call to unregister_netdevice_queue
Michal Kubeček (3):
ipv6: do not delete previously existing ECMP routes if add fails
ipv6: fix ECMP route replacement
ipv4: fill in table id when replacing a route
Mirek Kratochvil (1):
netfilter: nf_tables: fix bogus warning in nft_data_uninit()
Nathan Sullivan (4):
net: macb: Add better comment for RXUBR handling
net: macb: Document zynq gem dt binding
net: macb: Disable half duplex gigabit on Zynq
ARM: zynq: DT: Use the zynq binding with macb
Nicolas Dichtel (1):
rtnl/bond: don't send rtnl msg for unregistered iface
Roopa Prabhu (1):
rename RTNH_F_EXTERNAL to RTNH_F_OFFLOAD
Thadeu Lima de Souza Cascardo (1):
bridge: fix parsing of MLDv2 reports
Tim Beale (2):
net: phy: Make sure PHY_RESUMING state change is always processed
net: phy: Make sure phy_start() always re-enables the phy interrupts
Tommi Rantala (1):
ipvs: fix memory leak in ip_vs_ctl.c
Vlad Yasevich (2):
vlan: Correctly propagate promisc|allmulti flags in notifier.
ipv6: Fix udp checksums with raw sockets
Wen-chien Jesse Sung (2):
Bluetooth: ath3k: Add a new ID 0cf3:e006 to ath3k list
Bluetooth: btusb: Add support for 0cf3:e007
Wesley Kuo (1):
Bluetooth: Fix remote name event return directly.
Ying Xue (1):
rocker: fix a neigh entry leak issue
Yuchung Cheng (2):
tcp: only undo on partial ACKs in CA_Loss
tcp: don't over-send F-RTO probes
Documentation/devicetree/bindings/net/cdns-emac.txt | 3 ++-
arch/arm/boot/dts/zynq-7000.dtsi | 4 ++--
drivers/bluetooth/ath3k.c | 4 ++++
drivers/bluetooth/btusb.c | 3 +++
drivers/net/bonding/bond_options.c | 2 +-
drivers/net/ethernet/cadence/macb.c | 18 ++++++++++++++++++
drivers/net/ethernet/cadence/macb.h | 1 +
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 8 ++++----
drivers/net/ethernet/rocker/rocker.c | 8 +++++---
drivers/net/phy/phy.c | 34
+++++++++++++++++++---------------
drivers/net/usb/cdc_ncm.c | 2 +-
drivers/net/vxlan.c | 2 +-
include/linux/rhashtable.h | 19 +++++++++++++++++++
include/linux/skbuff.h | 1 +
include/linux/tcp.h | 2 ++
include/net/inet_connection_sock.h | 5 +++--
include/uapi/linux/netfilter/nf_conntrack_tcp.h | 3 +++
include/uapi/linux/rtnetlink.h | 2 +-
lib/rhashtable.c | 11 +++++++++++
net/8021q/vlan.c | 2 +-
net/bluetooth/hci_core.c | 6 ++++--
net/bridge/br_multicast.c | 2 +-
net/bridge/br_netfilter.c | 27
+++++++++------------------
net/bridge/br_stp_timer.c | 2 ++
net/bridge/netfilter/ebtables.c | 4 ++++
net/core/ethtool.c | 10 +++++++++-
net/core/rtnetlink.c | 3 +++
net/ipv4/fib_trie.c | 3 ++-
net/ipv4/netfilter/arp_tables.c | 6 ++++++
net/ipv4/netfilter/ip_tables.c | 6 ++++++
net/ipv4/route.c | 4 ++++
net/ipv4/tcp.c | 11 +++++++----
net/ipv4/tcp_fastopen.c | 4 ++++
net/ipv4/tcp_input.c | 19 +++++++++++++------
net/ipv4/tcp_minisocks.c | 2 +-
net/ipv6/ip6_fib.c | 39
+++++++++++++++++++++++++++++++++++++--
net/ipv6/ip6_output.c | 4 +++-
net/ipv6/netfilter/ip6_tables.c | 6 ++++++
net/ipv6/route.c | 14 +++++++++-----
net/ipv6/tcp_ipv6.c | 2 +-
net/ipv6/udp.c | 4 +++-
net/mac80211/wep.c | 6 ++++--
net/netfilter/Kconfig | 2 ++
net/netfilter/ipvs/ip_vs_ctl.c | 3 +++
net/netfilter/nf_conntrack_proto_tcp.c | 35
++++++++++++++++++++++++++++++++---
net/netfilter/nf_tables_api.c | 4 ++--
net/netfilter/nfnetlink_log.c | 19 ++++++++++---------
net/netfilter/nfnetlink_queue_core.c | 18 +++++++++---------
net/netlink/af_netlink.c | 3 ++-
net/sched/cls_api.c | 5 +++++
net/switchdev/switchdev.c | 6 +++---
51 files changed, 308 insertions(+), 105 deletions(-)
