Commit 1ec9871f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Cross-merge networking fixes after downstream PR (net-6.18-rc5).

Conflicts:

drivers/net/wireless/ath/ath12k/mac.c
  9222582e ("Revert "wifi: ath12k: Fix missing station power save configuration"")
  6917e268 ("wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon")
https://lore.kernel.org/11cece9f7e36c12efd732baa5718239b1bf8c950.camel@sipsolutions.net



Adjacent changes:

drivers/net/ethernet/intel/Kconfig
  b1d16f7c ("libie: depend on DEBUG_FS when building LIBIE_FWLOG")
  93f53db9 ("ice: switch to Page Pool")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 13068e9d c2c2ccfd

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com> 
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rae Moar <raemoar63@gmail.com> <rmoar@google.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

Documentation/devicetree/bindings/sound/qcom,pm4125-sdw.yaml

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ properties: 


    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 2

    maxItems: 2

    maxItems: 4

    items:

      enum: [1, 2, 3, 4]
@@ -48,7 +48,7 @@ properties: 


    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 2

    maxItems: 2

    maxItems: 5

    items:

      enum: [1, 2, 3, 4, 5]

MAINTAINERS

+9 −3
Original line number Diff line number Diff line
@@ -4819,6 +4819,7 @@ F: drivers/net/dsa/b53/* 
F:	drivers/net/dsa/bcm_sf2*

F:	include/linux/dsa/brcm.h

F:	include/linux/platform_data/b53.h

F:	net/dsa/tag_brcm.c









BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE









M:	Florian Fainelli <florian.fainelli@broadcom.com>








@@ -12521,6 +12522,7 @@ F:	include/linux/avf/virtchnl.h







F:	include/linux/net/intel/*/

















INTEL ETHERNET PROTOCOL DRIVER FOR RDMA









M:	Krzysztof Czurylo <krzysztof.czurylo@intel.com>









M:	Tatyana Nikolova <tatyana.e.nikolova@intel.com>









L:	linux-rdma@vger.kernel.org









S:	Supported








@@ -12861,7 +12863,8 @@ F:	tools/testing/selftests/sgx/*







K:	\bSGX_

















INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER









M:	Daniel Scally <djrscally@gmail.com>









M:	Daniel Scally <dan.scally@ideasonboard.com>









M:	Sakari Ailus <sakari.ailus@linux.intel.com>









S:	Maintained









F:	drivers/platform/x86/intel/int3472/









F:	include/linux/platform_data/x86/int3472.h








@@ -13425,9 +13428,12 @@ F:	mm/kasan/







F:	scripts/Makefile.kasan

















KCONFIG









M:	Nathan Chancellor <nathan@kernel.org>









M:	Nicolas Schier <nsc@kernel.org>









L:	linux-kbuild@vger.kernel.org









S:	Orphan









S:	Odd Fixes









Q:	https://patchwork.kernel.org/project/linux-kbuild/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git









F:	Documentation/kbuild/kconfig*









F:	scripts/Kconfig.include









F:	scripts/kconfig/








@@ -13612,7 +13618,7 @@ F:	fs/smb/server/







KERNEL UNIT TESTING FRAMEWORK (KUnit)









M:	Brendan Higgins <brendan.higgins@linux.dev>









M:	David Gow <davidgow@google.com>









R:	Rae Moar <rmoar@google.com>









R:	Rae Moar <raemoar63@gmail.com>









L:	linux-kselftest@vger.kernel.org









L:	kunit-dev@googlegroups.com









S:	Maintained
































Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 18









SUBLEVEL = 0









EXTRAVERSION = -rc3









EXTRAVERSION = -rc4









NAME = Baby Opossum Posse



















# *DOCUMENTATION*
































arch/arm64/net/bpf_jit_comp.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -1213,6 +1213,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,







	u8 src = bpf2a64[insn->src_reg];









	const u8 tmp = bpf2a64[TMP_REG_1];









	const u8 tmp2 = bpf2a64[TMP_REG_2];









	const u8 tmp3 = bpf2a64[TMP_REG_3];









	const u8 fp = bpf2a64[BPF_REG_FP];









	const u8 arena_vm_base = bpf2a64[ARENA_VM_START];









	const u8 priv_sp = bpf2a64[PRIVATE_SP];








@@ -1757,8 +1758,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,







	case BPF_ST | BPF_PROBE_MEM32 | BPF_W:









	case BPF_ST | BPF_PROBE_MEM32 | BPF_DW:









		if (BPF_MODE(insn->code) == BPF_PROBE_MEM32) {









			emit(A64_ADD(1, tmp2, dst, arena_vm_base), ctx);









			dst = tmp2;









			emit(A64_ADD(1, tmp3, dst, arena_vm_base), ctx);









			dst = tmp3;









		}









		if (dst == fp) {









			dst_adj = ctx->priv_sp_used ? priv_sp : A64_SP;