Commit 33e1b1b3 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.15-rc8).

Conflicts:
  80f2ab46 ("irdma: free iwdev->rf after removing MSI-X")
  4bcc0639 ("ice, irdma: fix an off by one in error handling code")
  c24a65b6 ("iidc/ice/irdma: Update IDC to support multiple consumers")
https://lore.kernel.org/20250513130630.280ee6c5@canb.auug.org.au



No extra adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3ccf3f44 5cdb2c77

Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd

+2 −2
Original line number Diff line number Diff line 
What:		/sys/bus/hid/drivers/hid-appletb-kbd/<dev>/mode

Date:		September, 2023

KernelVersion:	6.5

Date:		March, 2025

KernelVersion:	6.15

Contact:	linux-input@vger.kernel.org

Description:

		The set of keys displayed on the Touch Bar.

Documentation/devicetree/bindings/net/can/microchip,mcp2510.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/can/microchip,mcp2510.yaml#

$id: http://devicetree.org/schemas/net/can/microchip,mcp2510.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Microchip MCP251X stand-alone CAN controller

MAINTAINERS

+23 −4
Original line number Diff line number Diff line
@@ -10146,6 +10146,13 @@ F: drivers/gpio/gpio-regmap.c 
F:	include/linux/gpio/regmap.h

K:	(devm_)?gpio_regmap_(un)?register









GPIO SLOPPY LOGIC ANALYZER









M:	Wolfram Sang <wsa+renesas@sang-engineering.com>









S:	Supported









F:	Documentation/dev-tools/gpio-sloppy-logic-analyzer.rst









F:	drivers/gpio/gpio-sloppy-logic-analyzer.c









F:	tools/gpio/gpio-sloppy-logic-analyzer.sh

















GPIO SUBSYSTEM









M:	Linus Walleij <linus.walleij@linaro.org>









M:	Bartosz Golaszewski <brgl@bgdev.pl>








@@ -15549,6 +15556,18 @@ S:	Maintained







F:	include/linux/execmem.h









F:	mm/execmem.c

















MEMORY MANAGEMENT - GUP (GET USER PAGES)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









R:	Jason Gunthorpe <jgg@nvidia.com>









R:	John Hubbard <jhubbard@nvidia.com>









R:	Peter Xu <peterx@redhat.com>









L:	linux-mm@kvack.org









S:	Maintained









W:	http://www.linux-mm.org









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm









F:	mm/gup.c

















MEMORY MANAGEMENT - NUMA MEMBLOCKS AND NUMA EMULATION









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Mike Rapoport <rppt@kernel.org>








@@ -18451,7 +18470,7 @@ F:	include/uapi/linux/ppdev.h







PARAVIRT_OPS INTERFACE









M:	Juergen Gross <jgross@suse.com>









R:	Ajay Kaher <ajay.kaher@broadcom.com>









R:	Alexey Makhalov <alexey.amakhalov@broadcom.com>









R:	Alexey Makhalov <alexey.makhalov@broadcom.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	virtualization@lists.linux.dev









L:	x86@kernel.org








@@ -20613,8 +20632,8 @@ F:	Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml







F:	drivers/i2c/busses/i2c-emev2.c

















RENESAS ETHERNET AVB DRIVER









M:	Paul Barker <paul.barker.ct@bp.renesas.com>









M:	Niklas Söderlund <niklas.soderlund@ragnatech.se>









R:	Paul Barker <paul@pbarker.dev>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









S:	Maintained








@@ -25944,7 +25963,7 @@ F:	drivers/misc/vmw_balloon.c















VMWARE HYPERVISOR INTERFACE









M:	Ajay Kaher <ajay.kaher@broadcom.com>









M:	Alexey Makhalov <alexey.amakhalov@broadcom.com>









M:	Alexey Makhalov <alexey.makhalov@broadcom.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	virtualization@lists.linux.dev









L:	x86@kernel.org








@@ -25972,7 +25991,7 @@ F:	drivers/scsi/vmw_pvscsi.h







VMWARE VIRTUAL PTP CLOCK DRIVER









M:	Nick Shi <nick.shi@broadcom.com>









R:	Ajay Kaher <ajay.kaher@broadcom.com>









R:	Alexey Makhalov <alexey.amakhalov@broadcom.com>









R:	Alexey Makhalov <alexey.makhalov@broadcom.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	netdev@vger.kernel.org









S:	Supported

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 15









SUBLEVEL = 0









EXTRAVERSION = -rc6









EXTRAVERSION = -rc7









NAME = Baby Opossum Posse



















# *DOCUMENTATION*
































arch/loongarch/include/asm/ptrace.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -55,7 +55,7 @@ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long v

















/* Query offset/name of register from its name/offset */









extern int regs_query_register_offset(const char *name);









#define MAX_REG_OFFSET (offsetof(struct pt_regs, __last))









#define MAX_REG_OFFSET (offsetof(struct pt_regs, __last) - sizeof(unsigned long))



















/**









 * regs_get_register() - get register value from its offset