Commit 880b0dd9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
  21234e3a ("net/mlx5e: Fix use after free in mlx5e_fs_init()")
  c7eafc5e ("net/mlx5e: Convert ethtool_steering member of flow_steering struct to pointer")
https://lore.kernel.org/all/20220825104410.67d4709c@canb.auug.org.au/
https://lore.kernel.org/all/20220823055533.334471-1-saeed@kernel.org/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b9030780 4c612826

.get_maintainer.ignore

+2 −0
Original line number Diff line number Diff line 
Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Christoph Hellwig <hch@lst.de>

Marc Gonzalez <marc.w.gonzalez@free.fr>

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ allOf: 
              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun8i-v3s-tcon

              - allwinner,sun9i-a80-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      properties:
@@ -252,6 +253,7 @@ allOf: 
              - allwinner,sun8i-a83t-tcon-tv

              - allwinner,sun8i-r40-tcon-tv

              - allwinner,sun9i-a80-tcon-tv

              - allwinner,sun20i-d1-tcon-tv



    then:

      properties:
@@ -278,6 +280,7 @@ allOf: 
              - allwinner,sun9i-a80-tcon-lcd

              - allwinner,sun4i-a10-tcon

              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      required:
@@ -294,6 +297,7 @@ allOf: 
              - allwinner,sun8i-a23-tcon

              - allwinner,sun8i-a33-tcon

              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      properties:

Documentation/kbuild/kconfig-language.rst

+2 −2
Original line number Diff line number Diff line
@@ -525,8 +525,8 @@ followed by a test macro:: 
If you need to expose a compiler capability to makefiles and/or C source files,

`CC_HAS_` is the recommended prefix for the config option::



  config CC_HAS_ASM_GOTO

	def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))

  config CC_HAS_FOO

	def_bool $(success,$(srctree)/scripts/cc-check-foo.sh $(CC))



Build as module only

~~~~~~~~~~~~~~~~~~~~

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -3679,6 +3679,7 @@ F: Documentation/networking/bonding.rst 
F:	drivers/net/bonding/

F:	include/net/bond*

F:	include/uapi/linux/if_bonding.h

F:	tools/testing/selftests/drivers/net/bonding/









BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER









M:	Dan Robertson <dan@dlrobertson.com>








@@ -5145,6 +5146,7 @@ T:	git git://git.samba.org/sfrench/cifs-2.6.git







F:	Documentation/admin-guide/cifs/









F:	fs/cifs/









F:	fs/smbfs_common/









F:	include/uapi/linux/cifs

















COMPACTPCI HOTPLUG CORE









M:	Scott Murray <scott@spiteful.org>








@@ -9773,7 +9775,7 @@ M:	Christian Brauner <brauner@kernel.org>







M:	Seth Forshee <sforshee@kernel.org>









L:	linux-fsdevel@vger.kernel.org









S:	Maintained









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









T:	git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git









F:	Documentation/filesystems/idmappings.rst









F:	tools/testing/selftests/mount_setattr/









F:	include/linux/mnt_idmapping.h
































Makefile



+3
−5






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 0









SUBLEVEL = 0









EXTRAVERSION = -rc1









EXTRAVERSION = -rc2









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*








@@ -1113,13 +1113,11 @@ vmlinux-alldirs	:= $(sort $(vmlinux-dirs) Documentation \







		     $(patsubst %/,%,$(filter %/, $(core-) \









			$(drivers-) $(libs-))))



















subdir-modorder := $(addsuffix modules.order,$(filter %/, \









			$(core-y) $(core-m) $(libs-y) $(libs-m) \









			$(drivers-y) $(drivers-m)))



















build-dirs	:= $(vmlinux-dirs)









clean-dirs	:= $(vmlinux-alldirs)



















subdir-modorder := $(addsuffix /modules.order, $(build-dirs))



















# Externally visible symbols (used by link-vmlinux.sh)









KBUILD_VMLINUX_OBJS := $(head-y) $(patsubst %/,%/built-in.a, $(core-y))









KBUILD_VMLINUX_OBJS += $(addsuffix built-in.a, $(filter %/, $(libs-y)))