There is a small overlapping conflict to net/rxrpc/call_object.c, it should
be easy to resolve. In your tree there was a setup_timer() --> timer_setup()
conversion, and in my tree there are new lines adding a lockdep_set_class()
call right beforehand.
1) The forcedeth conversion from pci_*() DMA interfaces to dma_*() ones
missed one spot. From Zhu Yanjun.
2) Missing CRYPTO_SHA256 Kconfig dep in cfg80211, from Johannes Berg.
3) Fix checksum offloading in thunderx driver, from Sunil Goutham.
4) Add SPDX to vm_sockets_diag.h, from Stephen Hemminger.
5) Fix use after free of packet headers in TIPC, from Jon Maloy.
6) "sizeof(ptr)" vs "sizeof(*ptr)" bug in i40e, from Gustavo A R
Silva.
7) Tunneling fixes in mlxsw driver, from Petr Machata.
8) Fix crash in fanout_demux_rollover() of AF_PACKET, from Mike
Maloney.
9) Fix race in AF_PACKET bind() vs. NETDEV_UP notifier, from Eric
Dumazet.
10) Fix regression in sch_sfq.c due to one of the timer_setup()
conversions. From Paolo Abeni.
11) SCTP does list_for_each_entry() using wrong struct member,
fix from Xin Long.
12) Don't use big endian netlink attribute read for
IFLA_BOND_AD_ACTOR_SYSTEM, it is in cpu endianness.
Also from Xin Long.
13) Fix mis-initialization of q->link.clock in CBQ scheduler, preventing
adding filters there. From Jiri Pirko.
Please pull, thanks a lot!
The following changes since commit 1d3b78bbc6e983fabb3fbf91b76339bf66e4a12c:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2017-11-23 21:18:46 -1000)
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 f6454f80e8a965fca203dab28723f68ec78db608:
ethernet: dwmac-stm32: Fix copyright (2017-11-29 10:08:09 -0500)
----------------------------------------------------------------
Ahmad Fatoum (1):
e1000: Fix off-by-one in debug message
Amritha Nambiar (1):
i40e: Fix reporting incorrect error codes
Antoine Tenart (4):
net: mvpp2: fix the txq_init error path
net: mvpp2: cleanup probed ports in the probe error path
net: mvpp2: check ethtool sets the Tx ring size is to a valid min value
net: phy: marvell10g: fix the PHY id mask
Benjamin Gaignard (1):
ethernet: dwmac-stm32: Fix copyright
Christophe JAILLET (1):
bnxt_en: Fix an error handling path in 'bnxt_get_module_eeprom()'
Chun-Yeow Yeoh (1):
mac80211: fix the update of path metric for RANN frame
Colin Ian King (5):
ambassador: fix incorrect indentation of assignment statement
atm: fore200e: use %pK to format kernel addresses instead of %x
atm: lanai: use %p to format kernel addresses instead of %x
atm: suni: remove extraneous space to fix indentation
net: via: via-rhine: use %p to format void * address instead of %x
David Howells (12):
rxrpc: The mutex lock returned by rxrpc_accept_call() needs releasing
rxrpc: Don't set upgrade by default in sendmsg()
rxrpc: Provide a different lockdep key for call->user_mutex for kernel calls
rxrpc: Delay terminal ACK transmission on a client call
rxrpc: Split the call params from the operation params
rxrpc: Fix call timeouts
rxrpc: Don't transmit DELAY ACKs immediately on proposal
rxrpc: Express protocol timeouts in terms of RTT
rxrpc: Add a timeout for detecting lost ACKs/lost DATA
rxrpc: Add keepalive for a call
rxrpc: Fix service endpoint expiry
rxrpc: Fix conn expiry timers
David S. Miller (7):
Merge tag 'rxrpc-fixes-20171124' of git://git.kernel.org/.../dhowells/linux-fs
Merge branch 'sctp-stream-reconfig-fixes'
Merge tag 'mac80211-for-davem-2017-11-27' of git://git.kernel.org/.../jberg/mac80211
Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue
Merge branch 'mlxsw-GRE-offloading-fixes'
Merge branch 'mvpp2-fixes'
Merge branch 'sctp-fix-sparse-errors'
Eduardo Otubo (1):
xen-netfront: remove warning when unloading module
Eric Dumazet (1):
net/packet: fix a race in packet_bind() and packet_notifier()
Geert Uytterhoeven (1):
net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit
Gustavo A R Silva (1):
i40e/virtchnl: fix application of sizeof to pointer
Gustavo A. R. Silva (1):
net: openvswitch: datapath: fix data type in queue_gso_packets
Hyong-Youb Kim (1):
myri10ge: Update MAINTAINERS
Jakub Kicinski (1):
cls_bpf: don't decrement net's refcount when offload fails
Jiri Pirko (1):
net: sched: cbq: create block for q->link.block
Johannes Berg (2):
cfg80211: select CRYPTO_SHA256 if needed
mac80211: use QoS NDP for AP probing
Jon Maloy (1):
tipc: eliminate access after delete in group_filter_msg()
Jorgen Hansen (2):
VSOCK: Don't call vsock_stream_has_data in atomic context
VSOCK: Don't set sk_state to TCP_CLOSE before testing it
Mika Westerberg (1):
net: thunderbolt: Stop using zero to mean no valid DMA mapping
Mike Maloney (1):
packet: fix crash in fanout_demux_rollover()
Paolo Abeni (1):
sch_sfq: fix null pointer dereference at timer expiration
Petr Machata (4):
mlxsw: spectrum_router: Offload decap only for up tunnels
mlxsw: spectrum_router: Demote tunnels on VRF migration
mlxsw: spectrum_router: Handle encap to demoted tunnels
mlxsw: spectrum_router: Update nexthop RIF on update
Roman Kapl (1):
net: sched: crash on blocks with goto chain action
Sara Sharon (1):
mac80211: tear down RX aggregations first
Sasha Neftin (1):
e1000e: fix the use of magic numbers for buffer overrun issue
Stephen Hemminger (1):
uapi: add SPDX identifier to vm_sockets_diag.h
Sunil Goutham (1):
net: thunderx: Fix TCP/UDP checksum offload for IPv6 pkts
Vasyl Gomonovych (1):
lmc: Use memdup_user() as a cleanup
Vivien Didelot (1):
net: dsa: fix 'increment on 0' warning
Xin Long (11):
sctp: use sizeof(__u16) for each stream number length instead of magic number
sctp: only allow the out stream reset when the stream outq is empty
sctp: only allow the asoc reset when the asoc outq is empty
sctp: avoid flushing unsent queue when doing asoc reset
sctp: set sender next_tsn for the old result with ctsn_ack_point plus 1
sctp: force SCTP_ERROR_INV_STRM with __u32 when calling sctp_chunk_fail
sctp: force the params with right types for sctp csum apis
sctp: remove extern from stream sched
sctp: use right member as the param of list_for_each_entry
bonding: use nla_get_u64 to extract the value for IFLA_BOND_AD_ACTOR_SYSTEM
vxlan: use __be32 type for the param vni in __vxlan_fdb_delete
Yan Markman (1):
net: mvpp2: do not disable GMAC padding
Zhu Yanjun (1):
forcedeth: replace pci_unmap_page with dma_unmap_page
zhangliping (1):
openvswitch: fix the incorrect flow action alloc size
MAINTAINERS | 4 +-
drivers/atm/ambassador.c | 2 +-
drivers/atm/fore200e.c | 4 +-
drivers/atm/lanai.c | 8 ++--
drivers/atm/suni.c | 2 +-
drivers/net/bonding/bond_netlink.c | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +-
drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 1 -
drivers/net/ethernet/intel/e1000/e1000_hw.c | 6 ++-
drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 9 +++--
drivers/net/ethernet/intel/i40e/i40e_main.c | 1 -
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +-
drivers/net/ethernet/marvell/mvpp2.c | 46 +++++++++--------------
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 109 +++++++++++++++++++++++++++++++++--------------------
drivers/net/ethernet/nvidia/forcedeth.c | 4 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 4 +-
drivers/net/ethernet/via/via-rhine.c | 4 +-
drivers/net/ethernet/xilinx/Kconfig | 1 +
drivers/net/phy/marvell10g.c | 5 ++-
drivers/net/thunderbolt.c | 57 ++++++++++++----------------
drivers/net/vxlan.c | 4 +-
drivers/net/wan/lmc/lmc_main.c | 13 ++-----
drivers/net/wireless/ath/ath9k/channel.c | 2 +-
drivers/net/wireless/st/cw1200/sta.c | 4 +-
drivers/net/wireless/ti/wl1251/main.c | 2 +-
drivers/net/wireless/ti/wlcore/cmd.c | 5 ++-
drivers/net/xen-netfront.c | 18 +++++++++
include/net/mac80211.h | 8 +++-
include/net/sctp/checksum.h | 13 ++++---
include/net/sctp/sctp.h | 5 +++
include/net/sctp/stream_sched.h | 5 +++
include/trace/events/rxrpc.h | 86 ++++++++++++++++++++++++++++++------------
include/uapi/linux/rxrpc.h | 1 +
include/uapi/linux/vm_sockets_diag.h | 1 +
net/dsa/dsa2.c | 25 +++++++------
net/mac80211/ht.c | 4 +-
net/mac80211/mesh_hwmp.c | 15 +++++---
net/mac80211/mlme.c | 2 +-
net/mac80211/tx.c | 29 ++++++++++++++-
net/openvswitch/datapath.c | 2 +-
net/openvswitch/flow_netlink.c | 16 ++++----
net/packet/af_packet.c | 37 ++++++++----------
net/packet/internal.h | 1 -
net/rxrpc/af_rxrpc.c | 23 +++++++++++-
net/rxrpc/ar-internal.h | 103 +++++++++++++++++++++++++++++++++++++++++---------
net/rxrpc/call_accept.c | 2 +-
net/rxrpc/call_event.c | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
net/rxrpc/call_object.c | 62 +++++++++++++++++++------------
net/rxrpc/conn_client.c | 54 ++++++++++++++++++++-------
net/rxrpc/conn_event.c | 74 +++++++++++++++++++++++++++++-------
net/rxrpc/conn_object.c | 76 +++++++++++++++++++++++--------------
net/rxrpc/input.c | 74 ++++++++++++++++++++++++++++++++++--
net/rxrpc/misc.c | 19 ++++------
net/rxrpc/net_ns.c | 33 ++++++++++++++--
net/rxrpc/output.c | 43 ++++++++++++++++++++-
net/rxrpc/recvmsg.c | 12 +++---
net/rxrpc/sendmsg.c | 126 ++++++++++++++++++++++++++++++++++++++------------------------
net/rxrpc/sysctl.c | 60 +++++++++++++++---------------
net/sched/cls_api.c | 17 ++++++---
net/sched/cls_bpf.c | 23 +++++++-----
net/sched/sch_cbq.c | 9 ++++-
net/sched/sch_sfq.c | 1 +
net/sctp/protocol.c | 1 +
net/sctp/socket.c | 6 +--
net/sctp/stream.c | 79 ++++++++++++++++++++++++++++++++-------
net/sctp/stream_sched.c | 25 +++++++++----
net/sctp/stream_sched_prio.c | 7 +++-
net/sctp/stream_sched_rr.c | 7 +++-
net/tipc/group.c | 2 +-
net/vmw_vsock/vmci_transport.c | 14 ++++---
net/wireless/Kconfig | 7 ++++
72 files changed, 1182 insertions(+), 582 deletions(-)
There is a small overlapping conflict to net/rxrpc/call_object.c, it should be easy to resolve. In your tree there was a setup_timer() --> timer_setup() conversion, and in my tree there are new lines adding a lockdep_set_class() call right beforehand. 1) The forcedeth conversion from pci_*() DMA interfaces to dma_*() ones missed one spot. From Zhu Yanjun. 2) Missing CRYPTO_SHA256 Kconfig dep in cfg80211, from Johannes Berg. 3) Fix checksum offloading in thunderx driver, from Sunil Goutham. 4) Add SPDX to vm_sockets_diag.h, from Stephen Hemminger. 5) Fix use after free of packet headers in TIPC, from Jon Maloy. 6) "sizeof(ptr)" vs "sizeof(*ptr)" bug in i40e, from Gustavo A R Silva. 7) Tunneling fixes in mlxsw driver, from Petr Machata. 8) Fix crash in fanout_demux_rollover() of AF_PACKET, from Mike Maloney. 9) Fix race in AF_PACKET bind() vs. NETDEV_UP notifier, from Eric Dumazet. 10) Fix regression in sch_sfq.c due to one of the timer_setup() conversions. From Paolo Abeni. 11) SCTP does list_for_each_entry() using wrong struct member, fix from Xin Long. 12) Don't use big endian netlink attribute read for IFLA_BOND_AD_ACTOR_SYSTEM, it is in cpu endianness. Also from Xin Long. 13) Fix mis-initialization of q->link.clock in CBQ scheduler, preventing adding filters there. From Jiri Pirko. Please pull, thanks a lot! The following changes since commit 1d3b78bbc6e983fabb3fbf91b76339bf66e4a12c: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2017-11-23 21:18:46 -1000) 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 f6454f80e8a965fca203dab28723f68ec78db608: ethernet: dwmac-stm32: Fix copyright (2017-11-29 10:08:09 -0500) ---------------------------------------------------------------- Ahmad Fatoum (1): e1000: Fix off-by-one in debug message Amritha Nambiar (1): i40e: Fix reporting incorrect error codes Antoine Tenart (4): net: mvpp2: fix the txq_init error path net: mvpp2: cleanup probed ports in the probe error path net: mvpp2: check ethtool sets the Tx ring size is to a valid min value net: phy: marvell10g: fix the PHY id mask Benjamin Gaignard (1): ethernet: dwmac-stm32: Fix copyright Christophe JAILLET (1): bnxt_en: Fix an error handling path in 'bnxt_get_module_eeprom()' Chun-Yeow Yeoh (1): mac80211: fix the update of path metric for RANN frame Colin Ian King (5): ambassador: fix incorrect indentation of assignment statement atm: fore200e: use %pK to format kernel addresses instead of %x atm: lanai: use %p to format kernel addresses instead of %x atm: suni: remove extraneous space to fix indentation net: via: via-rhine: use %p to format void * address instead of %x David Howells (12): rxrpc: The mutex lock returned by rxrpc_accept_call() needs releasing rxrpc: Don't set upgrade by default in sendmsg() rxrpc: Provide a different lockdep key for call->user_mutex for kernel calls rxrpc: Delay terminal ACK transmission on a client call rxrpc: Split the call params from the operation params rxrpc: Fix call timeouts rxrpc: Don't transmit DELAY ACKs immediately on proposal rxrpc: Express protocol timeouts in terms of RTT rxrpc: Add a timeout for detecting lost ACKs/lost DATA rxrpc: Add keepalive for a call rxrpc: Fix service endpoint expiry rxrpc: Fix conn expiry timers David S. Miller (7): Merge tag 'rxrpc-fixes-20171124' of git://git.kernel.org/.../dhowells/linux-fs Merge branch 'sctp-stream-reconfig-fixes' Merge tag 'mac80211-for-davem-2017-11-27' of git://git.kernel.org/.../jberg/mac80211 Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue Merge branch 'mlxsw-GRE-offloading-fixes' Merge branch 'mvpp2-fixes' Merge branch 'sctp-fix-sparse-errors' Eduardo Otubo (1): xen-netfront: remove warning when unloading module Eric Dumazet (1): net/packet: fix a race in packet_bind() and packet_notifier() Geert Uytterhoeven (1): net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit Gustavo A R Silva (1): i40e/virtchnl: fix application of sizeof to pointer Gustavo A. R. Silva (1): net: openvswitch: datapath: fix data type in queue_gso_packets Hyong-Youb Kim (1): myri10ge: Update MAINTAINERS Jakub Kicinski (1): cls_bpf: don't decrement net's refcount when offload fails Jiri Pirko (1): net: sched: cbq: create block for q->link.block Johannes Berg (2): cfg80211: select CRYPTO_SHA256 if needed mac80211: use QoS NDP for AP probing Jon Maloy (1): tipc: eliminate access after delete in group_filter_msg() Jorgen Hansen (2): VSOCK: Don't call vsock_stream_has_data in atomic context VSOCK: Don't set sk_state to TCP_CLOSE before testing it Mika Westerberg (1): net: thunderbolt: Stop using zero to mean no valid DMA mapping Mike Maloney (1): packet: fix crash in fanout_demux_rollover() Paolo Abeni (1): sch_sfq: fix null pointer dereference at timer expiration Petr Machata (4): mlxsw: spectrum_router: Offload decap only for up tunnels mlxsw: spectrum_router: Demote tunnels on VRF migration mlxsw: spectrum_router: Handle encap to demoted tunnels mlxsw: spectrum_router: Update nexthop RIF on update Roman Kapl (1): net: sched: crash on blocks with goto chain action Sara Sharon (1): mac80211: tear down RX aggregations first Sasha Neftin (1): e1000e: fix the use of magic numbers for buffer overrun issue Stephen Hemminger (1): uapi: add SPDX identifier to vm_sockets_diag.h Sunil Goutham (1): net: thunderx: Fix TCP/UDP checksum offload for IPv6 pkts Vasyl Gomonovych (1): lmc: Use memdup_user() as a cleanup Vivien Didelot (1): net: dsa: fix 'increment on 0' warning Xin Long (11): sctp: use sizeof(__u16) for each stream number length instead of magic number sctp: only allow the out stream reset when the stream outq is empty sctp: only allow the asoc reset when the asoc outq is empty sctp: avoid flushing unsent queue when doing asoc reset sctp: set sender next_tsn for the old result with ctsn_ack_point plus 1 sctp: force SCTP_ERROR_INV_STRM with __u32 when calling sctp_chunk_fail sctp: force the params with right types for sctp csum apis sctp: remove extern from stream sched sctp: use right member as the param of list_for_each_entry bonding: use nla_get_u64 to extract the value for IFLA_BOND_AD_ACTOR_SYSTEM vxlan: use __be32 type for the param vni in __vxlan_fdb_delete Yan Markman (1): net: mvpp2: do not disable GMAC padding Zhu Yanjun (1): forcedeth: replace pci_unmap_page with dma_unmap_page zhangliping (1): openvswitch: fix the incorrect flow action alloc size MAINTAINERS | 4 +- drivers/atm/ambassador.c | 2 +- drivers/atm/fore200e.c | 4 +- drivers/atm/lanai.c | 8 ++-- drivers/atm/suni.c | 2 +- drivers/net/bonding/bond_netlink.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 1 - drivers/net/ethernet/intel/e1000/e1000_hw.c | 6 ++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 +- drivers/net/ethernet/intel/e1000e/netdev.c | 9 +++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 - drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/marvell/mvpp2.c | 46 +++++++++-------------- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 109 +++++++++++++++++++++++++++++++++-------------------- drivers/net/ethernet/nvidia/forcedeth.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 4 +- drivers/net/ethernet/via/via-rhine.c | 4 +- drivers/net/ethernet/xilinx/Kconfig | 1 + drivers/net/phy/marvell10g.c | 5 ++- drivers/net/thunderbolt.c | 57 ++++++++++++---------------- drivers/net/vxlan.c | 4 +- drivers/net/wan/lmc/lmc_main.c | 13 ++----- drivers/net/wireless/ath/ath9k/channel.c | 2 +- drivers/net/wireless/st/cw1200/sta.c | 4 +- drivers/net/wireless/ti/wl1251/main.c | 2 +- drivers/net/wireless/ti/wlcore/cmd.c | 5 ++- drivers/net/xen-netfront.c | 18 +++++++++ include/net/mac80211.h | 8 +++- include/net/sctp/checksum.h | 13 ++++--- include/net/sctp/sctp.h | 5 +++ include/net/sctp/stream_sched.h | 5 +++ include/trace/events/rxrpc.h | 86 ++++++++++++++++++++++++++++++------------ include/uapi/linux/rxrpc.h | 1 + include/uapi/linux/vm_sockets_diag.h | 1 + net/dsa/dsa2.c | 25 +++++++------ net/mac80211/ht.c | 4 +- net/mac80211/mesh_hwmp.c | 15 +++++--- net/mac80211/mlme.c | 2 +- net/mac80211/tx.c | 29 ++++++++++++++- net/openvswitch/datapath.c | 2 +- net/openvswitch/flow_netlink.c | 16 ++++---- net/packet/af_packet.c | 37 ++++++++---------- net/packet/internal.h | 1 - net/rxrpc/af_rxrpc.c | 23 +++++++++++- net/rxrpc/ar-internal.h | 103 +++++++++++++++++++++++++++++++++++++++++--------- net/rxrpc/call_accept.c | 2 +- net/rxrpc/call_event.c | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------ net/rxrpc/call_object.c | 62 +++++++++++++++++++------------ net/rxrpc/conn_client.c | 54 ++++++++++++++++++++------- net/rxrpc/conn_event.c | 74 +++++++++++++++++++++++++++++------- net/rxrpc/conn_object.c | 76 +++++++++++++++++++++++-------------- net/rxrpc/input.c | 74 ++++++++++++++++++++++++++++++++++-- net/rxrpc/misc.c | 19 ++++------ net/rxrpc/net_ns.c | 33 ++++++++++++++-- net/rxrpc/output.c | 43 ++++++++++++++++++++- net/rxrpc/recvmsg.c | 12 +++--- net/rxrpc/sendmsg.c | 126 ++++++++++++++++++++++++++++++++++++++------------------------ net/rxrpc/sysctl.c | 60 +++++++++++++++--------------- net/sched/cls_api.c | 17 ++++++--- net/sched/cls_bpf.c | 23 +++++++----- net/sched/sch_cbq.c | 9 ++++- net/sched/sch_sfq.c | 1 + net/sctp/protocol.c | 1 + net/sctp/socket.c | 6 +-- net/sctp/stream.c | 79 ++++++++++++++++++++++++++++++++------- net/sctp/stream_sched.c | 25 +++++++++---- net/sctp/stream_sched_prio.c | 7 +++- net/sctp/stream_sched_rr.c | 7 +++- net/tipc/group.c | 2 +- net/vmw_vsock/vmci_transport.c | 14 ++++--- net/wireless/Kconfig | 7 ++++ 72 files changed, 1182 insertions(+), 582 deletions(-)