Skip to content

Commit ded746b

Browse files
torvaldstorvalds
committed
Merge tag 'net-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from bpf, can and netfilter. Current release - regressions: - bpf, sockmap: re-evaluate proto ops when psock is removed from sockmap Current release - new code bugs: - bpf: fix bpf_check_mod_kfunc_call for built-in modules - ice: fixes for TC classifier offloads - vrf: don't run conntrack on vrf with !dflt qdisc Previous releases - regressions: - bpf: fix the off-by-two error in range markings - seg6: fix the iif in the IPv6 socket control block - devlink: fix netns refcount leak in devlink_nl_cmd_reload() - dsa: mv88e6xxx: fix "don't use PHY_DETECT on internal PHY's" - dsa: mv88e6xxx: allow use of PHYs on CPU and DSA ports Previous releases - always broken: - ethtool: do not perform operations on net devices being unregistered - udp: use datalen to cap max gso segments - ice: fix races in stats collection - fec: only clear interrupt of handling queue in fec_enet_rx_queue() - m_can: pci: fix incorrect reference clock rate - m_can: disable and ignore ELO interrupt - mvpp2: fix XDP rx queues registering Misc: - treewide: add missing includes masked by cgroup -> bpf.h dependency" * tag 'net-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (82 commits) net: dsa: mv88e6xxx: allow use of PHYs on CPU and DSA ports net: wwan: iosm: fixes unable to send AT command during mbim tx net: wwan: iosm: fixes net interface nonfunctional after fw flash net: wwan: iosm: fixes unnecessary doorbell send net: dsa: felix: Fix memory leak in felix_setup_mmio_filtering MAINTAINERS: s390/net: remove myself as maintainer net/sched: fq_pie: prevent dismantle issue net: mana: Fix memory leak in mana_hwc_create_wq seg6: fix the iif in the IPv6 socket control block nfp: Fix memory leak in nfp_cpp_area_cache_add() nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done nfc: fix segfault in nfc_genl_dump_devices_done udp: using datalen to cap max gso segments net: dsa: mv88e6xxx: error handling for serdes_power functions can: kvaser_usb: get CAN clock frequency from device can: kvaser_pciefd: kvaser_pciefd_rx_error_frame(): increase correct stats->{rx,tx}_errors counter net: mvpp2: fix XDP rx queues registering vmxnet3: fix minimum vectors alloc issue net, neigh: clear whole pneigh_entry at alloc time net: dsa: mv88e6xxx: fix "don't use PHY_DETECT on internal PHY's" ...
2 parents 27698cd + 04ec4e6 commit ded746b

100 files changed

Lines changed: 1370 additions & 383 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/locking/locktypes.rst‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -439,11 +439,9 @@ preemption. The following substitution works on both kernels::
439439
spin_lock(&p->lock);
440440
p->count += this_cpu_read(var2);
441441

442-
On a non-PREEMPT_RT kernel migrate_disable() maps to preempt_disable()
443-
which makes the above code fully equivalent. On a PREEMPT_RT kernel
444442
migrate_disable() ensures that the task is pinned on the current CPU which
445443
in turn guarantees that the per-CPU access to var1 and var2 are staying on
446-
the same CPU.
444+
the same CPU while the task remains preemptible.
447445

448446
The migrate_disable() substitution is not valid for the following
449447
scenario::
@@ -456,9 +454,8 @@ scenario::
456454
p = this_cpu_ptr(&var1);
457455
p->val = func2();
458456

459-
While correct on a non-PREEMPT_RT kernel, this breaks on PREEMPT_RT because
460-
here migrate_disable() does not protect against reentrancy from a
461-
preempting task. A correct substitution for this case is::
457+
This breaks because migrate_disable() does not protect against reentrancy from
458+
a preempting task. A correct substitution for this case is::
462459

463460
func()
464461
{

‎MAINTAINERS‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12180,8 +12180,8 @@ F: drivers/net/ethernet/mellanox/mlx5/core/fpga/*
1218012180
F: include/linux/mlx5/mlx5_ifc_fpga.h
1218112181

1218212182
MELLANOX ETHERNET SWITCH DRIVERS
12183-
M: Jiri Pirko <jiri@nvidia.com>
1218412183
M: Ido Schimmel <idosch@nvidia.com>
12184+
M: Petr Machata <petrm@nvidia.com>
1218512185
L: netdev@vger.kernel.org
1218612186
S: Supported
1218712187
W: http://www.mellanox.com
@@ -16629,7 +16629,6 @@ W: http://www.ibm.com/developerworks/linux/linux390/
1662916629
F: drivers/iommu/s390-iommu.c
1663016630

1663116631
S390 IUCV NETWORK LAYER
16632-
M: Julian Wiedmann <jwi@linux.ibm.com>
1663316632
M: Alexandra Winter <wintera@linux.ibm.com>
1663416633
M: Wenjia Zhang <wenjia@linux.ibm.com>
1663516634
L: linux-s390@vger.kernel.org
@@ -16641,7 +16640,6 @@ F: include/net/iucv/
1664116640
F: net/iucv/
1664216641

1664316642
S390 NETWORK DRIVERS
16644-
M: Julian Wiedmann <jwi@linux.ibm.com>
1664516643
M: Alexandra Winter <wintera@linux.ibm.com>
1664616644
M: Wenjia Zhang <wenjia@linux.ibm.com>
1664716645
L: linux-s390@vger.kernel.org

‎arch/mips/net/bpf_jit_comp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ do { \
9898
#define emit(...) __emit(__VA_ARGS__)
9999

100100
/* Workaround for R10000 ll/sc errata */
101-
#ifdef CONFIG_WAR_R10000
101+
#ifdef CONFIG_WAR_R10000_LLSC
102102
#define LLSC_beqz beqzl
103103
#else
104104
#define LLSC_beqz beqz

‎block/fops.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/falloc.h>
1616
#include <linux/suspend.h>
1717
#include <linux/fs.h>
18+
#include <linux/module.h>
1819
#include "blk.h"
1920

2021
static inline struct inode *bdev_file_inode(struct file *file)

‎drivers/gpu/drm/drm_gem_shmem_helper.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/shmem_fs.h>
1010
#include <linux/slab.h>
1111
#include <linux/vmalloc.h>
12+
#include <linux/module.h>
1213

1314
#ifdef CONFIG_X86
1415
#include <asm/set_memory.h>

‎drivers/gpu/drm/i915/gt/intel_gtt.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/slab.h> /* fault-inject.h is not standalone! */
77

88
#include <linux/fault-inject.h>
9+
#include <linux/sched/mm.h>
910

1011
#include "gem/i915_gem_lmem.h"
1112
#include "i915_trace.h"

‎drivers/gpu/drm/i915/i915_request.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <linux/sched.h>
3030
#include <linux/sched/clock.h>
3131
#include <linux/sched/signal.h>
32+
#include <linux/sched/mm.h>
3233

3334
#include "gem/i915_gem_context.h"
3435
#include "gt/intel_breadcrumbs.h"

‎drivers/gpu/drm/lima/lima_device.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <linux/regulator/consumer.h>
55
#include <linux/reset.h>
66
#include <linux/clk.h>
7+
#include <linux/slab.h>
78
#include <linux/dma-mapping.h>
89
#include <linux/platform_device.h>
910

‎drivers/gpu/drm/msm/msm_gem_shrinker.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include <linux/vmalloc.h>
8+
#include <linux/sched/mm.h>
89

910
#include "msm_drv.h"
1011
#include "msm_gem.h"

‎drivers/gpu/drm/ttm/ttm_tt.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <linux/sched.h>
3535
#include <linux/shmem_fs.h>
3636
#include <linux/file.h>
37+
#include <linux/module.h>
3738
#include <drm/drm_cache.h>
3839
#include <drm/ttm/ttm_bo_driver.h>
3940

0 commit comments

Comments
 (0)