Commit 203e3beb 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.17-rc8).

Conflicts:

drivers/net/can/spi/hi311x.c
  6b696808 ("can: hi311x: fix null pointer dereference when resuming from sleep before interface was enabled")
  27ce71e1 ("net: WQ_PERCPU added to alloc_workqueue users")
https://lore.kernel.org/72ce7599-1b5b-464a-a5de-228ff9724701@kernel.org

net/smc/smc_loopback.c
drivers/dibs/dibs_loopback.c
  a35c04de ("net/smc: fix warning in smc_rx_splice() when calling get_page()")
  cc21191b ("dibs: Move data path to dibs layer")
https://lore.kernel.org/74368a5c-48ac-4f8e-a198-40ec1ed3cf5f@kernel.org



Adjacent changes:

drivers/net/dsa/lantiq/lantiq_gswip.c
  c0054b25 ("net: dsa: lantiq_gswip: move gswip_add_single_port_br() call to port_setup()")
  7a1eaef0 ("net: dsa: lantiq_gswip: support model-specific mac_select_pcs()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 12de5f0f 4ff71af0

.get_maintainer.ignore

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

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

Alyssa Rosenzweig <alyssa@rosenzweig.io>

Christoph Hellwig <hch@lst.de>

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

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

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ Paulo Alcantara <pc@manguebit.org> <palcantara@suse.com> 
Paulo Alcantara <pc@manguebit.org> <pc@manguebit.com>

Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>

Peter Oruba <peter.oruba@amd.com>

Peter Oruba <peter@oruba.de>

Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>

Documentation/sound/alsa-configuration.rst

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ delayed_register 
    notice the need.

skip_validation

    Skip unit descriptor validation (default: no).

    The option is used to ignores the validation errors with the hexdump

    The option is used to ignore the validation errors with the hexdump

    of the unit descriptor instead of a driver probe error, so that we

    can check its details.

quirk_flags

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -1845,7 +1845,6 @@ S: Odd fixes 
F:	drivers/input/mouse/bcm5974.c









APPLE PCIE CONTROLLER DRIVER









M:	Alyssa Rosenzweig <alyssa@rosenzweig.io>









M:	Marc Zyngier <maz@kernel.org>









L:	linux-pci@vger.kernel.org









S:	Maintained








@@ -2364,7 +2363,6 @@ F:	sound/soc/codecs/ssm3515.c







ARM/APPLE MACHINE SUPPORT









M:	Sven Peter <sven@kernel.org>









M:	Janne Grunau <j@jannau.net>









R:	Alyssa Rosenzweig <alyssa@rosenzweig.io>









R:	Neal Gompa <neal@gompa.dev>









L:	asahi@lists.linux.dev









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)








@@ -22074,6 +22072,7 @@ F:	drivers/infiniband/ulp/rtrs/















RUNTIME VERIFICATION (RV)









M:	Steven Rostedt <rostedt@goodmis.org>









M:	Gabriele Monaco <gmonaco@redhat.com>









L:	linux-trace-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/trace/rv/








@@ -26819,7 +26818,7 @@ F:	drivers/nvdimm/nd_virtio.c







F:	drivers/nvdimm/virtio_pmem.c

















VIRTIO RTC DRIVER









M:	Peter Hilber <quic_philber@quicinc.com>









M:	Peter Hilber <peter.hilber@oss.qualcomm.com>









L:	virtualization@lists.linux.dev









S:	Maintained









F:	drivers/virtio/virtio_rtc_*

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 17









SUBLEVEL = 0









EXTRAVERSION = -rc6









EXTRAVERSION = -rc7









NAME = Baby Opossum Posse



















# *DOCUMENTATION*