Commit dc0a7b52 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Conflicts:

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
  6e9d51b1 ("net/mlx5e: Initialize link speed to zero")
  1bffcea4 ("net/mlx5e: Add devlink hairpin queues parameters")
https://lore.kernel.org/all/20230324120623.4ebbc66f@canb.auug.org.au/
https://lore.kernel.org/all/20230321211135.47711-1-saeed@kernel.org/



Adjacent changes:

drivers/net/phy/phy.c
  323fe43c ("net: phy: Improved PHY error reporting in state machine")
  4203d840 ("net: phy: Ensure state transitions are processed from phy_stop()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 323fe43c 608f1b13

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ modules.order 
# RPM spec file (make rpm-pkg)

#

/*.spec

/rpmbuild/



#

# Debian directory (make deb-pkg)

Documentation/networking/xdp-rx-metadata.rst

+5 −2
Original line number Diff line number Diff line
@@ -23,10 +23,13 @@ metadata is supported, this set will grow: 
An XDP program can use these kfuncs to read the metadata into stack

variables for its own consumption. Or, to pass the metadata on to other

consumers, an XDP program can store it into the metadata area carried

ahead of the packet.

ahead of the packet. Not all packets will necessary have the requested

metadata available in which case the driver returns ``-ENODATA``.



Not all kfuncs have to be implemented by the device driver; when not

implemented, the default ones that return ``-EOPNOTSUPP`` will be used.

implemented, the default ones that return ``-EOPNOTSUPP`` will be used

to indicate the device driver have not implemented this kfunc.





Within an XDP frame, the metadata layout (accessed via ``xdp_buff``) is

as follows::

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -19157,9 +19157,7 @@ W: http://www.brownhat.org/sis900.html 
F:	drivers/net/ethernet/sis/sis900.*









SIS FRAMEBUFFER DRIVER









M:	Thomas Winischhofer <thomas@winischhofer.net>









S:	Maintained









W:	http://www.winischhofer.net/linuxsisvga.shtml









S:	Orphan









F:	Documentation/fb/sisfb.rst









F:	drivers/video/fbdev/sis/









F:	include/video/sisfb.h

























Makefile



+5
−8






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 3









SUBLEVEL = 0









EXTRAVERSION = -rc2









EXTRAVERSION = -rc3









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*








@@ -274,8 +274,7 @@ no-dot-config-targets := $(clean-targets) \







			 cscope gtags TAGS tags help% %docs check% coccicheck \









			 $(version_h) headers headers_% archheaders archscripts \









			 %asm-generic kernelversion %src-pkg dt_binding_check \









			 outputmakefile rustavailable rustfmt rustfmtcheck \









			 scripts_package









			 outputmakefile rustavailable rustfmt rustfmtcheck









# Installation targets should not require compiler. Unfortunately, vdso_install









# is an exception where build artifacts may be updated. This must be fixed.









no-compiler-targets := $(no-dot-config-targets) install dtbs_install \








@@ -1605,7 +1604,7 @@ MRPROPER_FILES += include/config include/generated          \







		  certs/signing_key.pem \









		  certs/x509.genkey \









		  vmlinux-gdb.py \









		  *.spec \









		  *.spec rpmbuild \









		  rust/libmacros.so



















# clean - Delete most, but leave enough to build external modules








@@ -1656,10 +1655,6 @@ distclean: mrproper







%pkg: include/config/kernel.release FORCE









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.package $@



















PHONY += scripts_package









scripts_package: scripts_basic









	$(Q)$(MAKE) $(build)=scripts scripts/list-gitignored



















# Brief documentation of the typical targets used









# ---------------------------------------------------------------------------


















@@ -1886,6 +1881,8 @@ endif

















else # KBUILD_EXTMOD



















filechk_kernel.release = echo $(KERNELRELEASE)



















###









# External module support.









# When building external modules the kernel used as basis is considered
































arch/arm/lib/uaccess_with_memcpy.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -116,7 +116,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)







			tocopy = n;



















		ua_flags = uaccess_save_and_enable();









		memcpy((void *)to, from, tocopy);









		__memcpy((void *)to, from, tocopy);









		uaccess_restore(ua_flags);









		to += tocopy;









		from += tocopy;








@@ -178,7 +178,7 @@ __clear_user_memset(void __user *addr, unsigned long n)







			tocopy = n;



















		ua_flags = uaccess_save_and_enable();









		memset((void *)addr, 0, tocopy);









		__memset((void *)addr, 0, tocopy);









		uaccess_restore(ua_flags);









		addr += tocopy;









		n -= tocopy;