diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-05 18:20:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-05 18:20:39 +0300 |
| commit | 212dab0541eb916f29d55f914c8e84e13c6b214d (patch) | |
| tree | 598087908a7f4c50bdb1987de8ac3f87cdec607e /fs/ocfs2/ocfs2_trace.h | |
| parent | 60f5a21736322c25b297b022aa48aeb28fd56f9e (diff) | |
| parent | 91874ecf32e41b5d86a4cb9d60e0bee50d828058 (diff) | |
| download | linux-212dab0541eb916f29d55f914c8e84e13c6b214d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
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.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
netlink: Don't shift on 64 for ngroups
net/smc: no cursor update send in state SMC_INIT
l2tp: fix missing refcount drop in pppol2tp_tunnel_ioctl()
mlxsw: core_acl_flex_actions: Remove redundant mirror resource destruction
mlxsw: core_acl_flex_actions: Remove redundant counter destruction
mlxsw: core_acl_flex_actions: Remove redundant resource destruction
mlxsw: core_acl_flex_actions: Return error for conflicting actions
selftests/bpf: update test_lwt_seg6local.sh according to iproute2
drivers: net: lmc: fix case value for target abort error
selftest/net: fix protocol family to work for IPv4.
net: xsk: don't return frames via the allocator on error
tools/bpftool: fix a percpu_array map dump problem
Diffstat (limited to 'fs/ocfs2/ocfs2_trace.h')
0 files changed, 0 insertions, 0 deletions