Commit 59ba823e 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.19-rc5).

No conflicts, or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 76de4e15 f2a3b12b

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>

Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>

Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>

Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -705,6 +706,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org> 
Santosh Shilimkar <santosh.shilimkar@oracle.org>

Santosh Shilimkar <ssantosh@kernel.org>

Sarangdhar Joshi <spjoshi@codeaurora.org>

Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>

Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>

Sascha Hauer <s.hauer@pengutronix.de>

Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>

Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>

Documentation/netlink/specs/netdev.yaml

+4 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ attribute-sets: 
        name: ifindex

        doc: |

          ifindex of the netdev to which the pool belongs.

          May be reported as 0 if the page pool was allocated for a netdev

          May not be reported if the page pool was allocated for a netdev

          which got destroyed already (page pools may outlast their netdevs

          because they wait for all memory to be returned).

        type: u32
@@ -601,7 +601,9 @@ operations: 
      name: page-pool-get

      doc: |

        Get / dump information about Page Pools.

        (Only Page Pools associated with a net_device can be listed.)

        Only Page Pools associated by the driver with a net_device

        can be listed. ifindex will not be reported if the net_device

        no longer exists.

      attribute-set: page-pool

      do:

        request:

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -1283,6 +1283,7 @@ F: include/uapi/drm/amdxdna_accel.h 








AMD XGBE DRIVER









M:	"Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>









M:	Raju Rangoju <Raju.Rangoju@amd.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi








@@ -6532,7 +6533,7 @@ F:	rust/kernel/cpufreq.rs







F:	tools/testing/selftests/cpufreq/

















CPU FREQUENCY DRIVERS - VIRTUAL MACHINE CPUFREQ









M:	Saravana Kannan <saravanak@google.com>









M:	Saravana Kannan <saravanak@kernel.org>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	drivers/cpufreq/virtual-cpufreq.c








@@ -7170,7 +7171,7 @@ F:	drivers/base/devcoredump.c







F:	include/linux/devcoredump.h

















DEVICE DEPENDENCY HELPER SCRIPT









M:	Saravana Kannan <saravanak@google.com>









M:	Saravana Kannan <saravanak@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	scripts/dev-needs.sh








@@ -18283,7 +18284,7 @@ X:	net/wireless/







X:	tools/testing/selftests/net/can/

















NETWORKING [IOAM]









M:	Justin Iurman <justin.iurman@uliege.be>









M:	Justin Iurman <justin.iurman@gmail.com>









S:	Maintained









F:	Documentation/networking/ioam6*









F:	include/linux/ioam6*








@@ -19547,7 +19548,7 @@ F:	include/linux/oa_tc6.h















OPEN FIRMWARE AND FLATTENED DEVICE TREE









M:	Rob Herring <robh@kernel.org>









M:	Saravana Kannan <saravanak@google.com>









M:	Saravana Kannan <saravanak@kernel.org>









L:	devicetree@vger.kernel.org









S:	Maintained









Q:	http://patchwork.kernel.org/project/devicetree/list/

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 19









SUBLEVEL = 0









EXTRAVERSION = -rc3









EXTRAVERSION = -rc4









NAME = Baby Opossum Posse



















# *DOCUMENTATION*
































arch/loongarch/include/asm/loongarch.h



+7
−0






























Original line number
Diff line number
Diff line







@@ -94,6 +94,12 @@







#define  CPUCFG2_LSPW			BIT(21)









#define  CPUCFG2_LAM			BIT(22)









#define  CPUCFG2_PTW			BIT(24)









#define  CPUCFG2_FRECIPE		BIT(25)









#define  CPUCFG2_DIV32			BIT(26)









#define  CPUCFG2_LAM_BH			BIT(27)









#define  CPUCFG2_LAMCAS			BIT(28)









#define  CPUCFG2_LLACQ_SCREL		BIT(29)









#define  CPUCFG2_SCQ			BIT(30)



















#define LOONGARCH_CPUCFG3		0x3









#define  CPUCFG3_CCDMA			BIT(0)








@@ -108,6 +114,7 @@







#define  CPUCFG3_SPW_HG_HF		BIT(11)









#define  CPUCFG3_RVA			BIT(12)









#define  CPUCFG3_RVAMAX			GENMASK(16, 13)









#define  CPUCFG3_DBAR_HINTS		BIT(17)









#define  CPUCFG3_ALDORDER_CAP		BIT(18) /* All address load ordered, capability */









#define  CPUCFG3_ASTORDER_CAP		BIT(19) /* All address store ordered, capability */









#define  CPUCFG3_ALDORDER_STA		BIT(20) /* All address load ordered, status */