Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: include/linux/filter.h kernel/bpf/core.c 66e13b61 ("bpf: verifier: prevent userspace memory access") d503a04f ("bpf: Add support for certain atomics in bpf_arena to x86 JIT") https://lore.kernel.org/all/20240429114939.210328b0@canb.auug.org.au/ No adjacent changes. Signed-off-by:Jakub Kicinski <kuba@kernel.org>
No related branches found
No related tags found
Showing
- .mailmap 1 addition, 0 deletions.mailmap
- Documentation/admin-guide/kernel-parameters.txt 3 additions, 0 deletionsDocumentation/admin-guide/kernel-parameters.txt
- Documentation/core-api/workqueue.rst 3 additions, 3 deletionsDocumentation/core-api/workqueue.rst
- Documentation/devicetree/bindings/eeprom/at24.yaml 1 addition, 4 deletionsDocumentation/devicetree/bindings/eeprom/at24.yaml
- Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml 2 additions, 0 deletions...on/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml
- Documentation/devicetree/bindings/soc/rockchip/grf.yaml 1 addition, 0 deletionsDocumentation/devicetree/bindings/soc/rockchip/grf.yaml
- Documentation/rust/arch-support.rst 1 addition, 1 deletionDocumentation/rust/arch-support.rst
- Documentation/timers/no_hz.rst 2 additions, 5 deletionsDocumentation/timers/no_hz.rst
- Documentation/translations/zh_CN/core-api/workqueue.rst 371 additions, 27 deletionsDocumentation/translations/zh_CN/core-api/workqueue.rst
- MAINTAINERS 15 additions, 16 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/Kconfig 8 additions, 0 deletionsarch/Kconfig
- arch/arc/Kconfig 0 additions, 1 deletionarch/arc/Kconfig
- arch/arc/boot/Makefile 2 additions, 2 deletionsarch/arc/boot/Makefile
- arch/arc/boot/dts/axc003.dtsi 2 additions, 2 deletionsarch/arc/boot/dts/axc003.dtsi
- arch/arc/boot/dts/hsdk.dts 0 additions, 1 deletionarch/arc/boot/dts/hsdk.dts
- arch/arc/boot/dts/vdk_axs10x_mb.dtsi 1 addition, 1 deletionarch/arc/boot/dts/vdk_axs10x_mb.dtsi
- arch/arc/include/asm/cachetype.h 0 additions, 9 deletionsarch/arc/include/asm/cachetype.h
- arch/arc/include/asm/dsp.h 1 addition, 1 deletionarch/arc/include/asm/dsp.h
- arch/arc/include/asm/entry-compact.h 5 additions, 5 deletionsarch/arc/include/asm/entry-compact.h
Loading
Please register or sign in to comment