From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: [GIT] Networking Date: Sun, 05 Aug 2018 00:47:44 -0700 (PDT) Message-ID: <20180805.004744.1043412275329854518.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: torvalds@linux-foundation.org Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 1) Handle frames in error situations properly in AF_XDP, from Jakub Kicinski. 2) tcp_mmap test case only tests ipv6 due to a thinko, fix from Maninder Singh. 3) Session refcnt fix in l2tp_ppp, from Guillaume Nault. 4) Fix regression in netlink bind handling of multicast gruops, from Dmitry Safonov. Please pull, thanks a lot! The following changes since commit e30cb13c5a09ff5f043a6570c32e49b063bea6a1: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2018-08-02 10:12:02 -0700) are available in the Git repository at: gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/davem/net.git for you to fetch changes up to 91874ecf32e41b5d86a4cb9d60e0bee50d828058: netlink: Don't shift on 64 for ngroups (2018-08-04 17:52:51 -0700) ---------------------------------------------------------------- Colin Ian King (1): drivers: net: lmc: fix case value for target abort error David S. Miller (2): Merge branch 'mlxsw-Fix-ACL-actions-error-condition-handling' Merge git://git.kernel.org/.../bpf/bpf Dmitry Safonov (1): netlink: Don't shift on 64 for ngroups Guillaume Nault (1): l2tp: fix missing refcount drop in pppol2tp_tunnel_ioctl() Jakub Kicinski (1): net: xsk: don't return frames via the allocator on error Maninder Singh (1): selftest/net: fix protocol family to work for IPv4. Mathieu Xhonneux (1): selftests/bpf: update test_lwt_seg6local.sh according to iproute2 Nir Dotan (4): mlxsw: core_acl_flex_actions: Return error for conflicting actions mlxsw: core_acl_flex_actions: Remove redundant resource destruction mlxsw: core_acl_flex_actions: Remove redundant counter destruction mlxsw: core_acl_flex_actions: Remove redundant mirror resource destruction Ursula Braun (1): net/smc: no cursor update send in state SMC_INIT Yonghong Song (1): tools/bpftool: fix a percpu_array map dump problem drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c | 51 +++++++++++++++++++++++++++++---------------------- drivers/net/wan/lmc/lmc_main.c | 2 +- net/l2tp/l2tp_ppp.c | 13 +++++++++---- net/netlink/af_netlink.c | 4 ++-- net/smc/smc_cdc.c | 3 ++- net/xdp/xsk.c | 4 +--- tools/bpf/bpftool/map.c | 14 +++++++++----- tools/testing/selftests/bpf/test_lwt_seg6local.sh | 6 +++--- tools/testing/selftests/net/tcp_mmap.c | 2 +- 9 files changed, 57 insertions(+), 42 deletions(-)