Commit c99ebb61 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.18-rc6).

No conflicts, adjacent changes in:

drivers/net/phy/micrel.c
  96a9178a ("net: phy: micrel: lan8814 fix reset of the QSGMII interface")
  61b7ade9 ("net: phy: micrel: Add support for non PTP SKUs for lan8814")

and a trivial one in tools/testing/selftests/drivers/net/Makefile.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f694d215 d0309c05

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -605,7 +605,8 @@ Oleksij Rempel <o.rempel@pengutronix.de> 
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>

Ondřej Jirman <megi@xff.cz> <megous@megous.com>

Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.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/ti,twl4030-gpio.yaml#

$id: http://devicetree.org/schemas/gpio/ti,twl4030-gpio.yaml#

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



title: TI TWL4030 GPIO controller

Documentation/firmware-guide/acpi/i2c-muxes.rst

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }
@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }

Documentation/userspace-api/netlink/intro-specs.rst

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ Simple CLI 
Kernel comes with a simple CLI tool which should be useful when

developing Netlink related code. The tool is implemented in Python

and can use a YAML specification to issue Netlink requests

to the kernel. Only Generic Netlink is supported.

to the kernel.



The tool is located at ``tools/net/ynl/pyynl/cli.py``. It accepts

a handul of arguments, the most important ones are:

a handful of arguments, the most important ones are:



 - ``--spec`` - point to the spec file

 - ``--do $name`` / ``--dump $name`` - issue request ``$name``

MAINTAINERS

+6 −3
Original line number Diff line number Diff line
@@ -915,6 +915,7 @@ F: drivers/staging/media/sunxi/cedrus/ 
ALPHA PORT

M:	Richard Henderson <richard.henderson@linaro.org>

M:	Matt Turner <mattst88@gmail.com>

M:	Magnus Lindholm <linmag7@gmail.com>

L:	linux-alpha@vger.kernel.org

S:	Odd Fixes

F:	arch/alpha/
@@ -9208,6 +9209,7 @@ R: Yue Hu <zbestahu@gmail.com> 
R:	Jeffle Xu <jefflexu@linux.alibaba.com>

R:	Sandeep Dhavale <dhavale@google.com>

R:	Hongbo Li <lihongbo22@huawei.com>

R:	Chunhai Guo <guochunhai@vivo.com>

L:	linux-erofs@lists.ozlabs.org

S:	Maintained

W:	https://erofs.docs.kernel.org
@@ -13659,7 +13661,7 @@ F: virt/kvm/* 








KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)









M:	Marc Zyngier <maz@kernel.org>









M:	Oliver Upton <oliver.upton@linux.dev>









M:	Oliver Upton <oupton@kernel.org>









R:	Joey Gouly <joey.gouly@arm.com>









R:	Suzuki K Poulose <suzuki.poulose@arm.com>









R:	Zenghui Yu <yuzenghui@huawei.com>








@@ -16499,12 +16501,12 @@ F:	mm/secretmem.c















MEMORY MANAGEMENT - SWAP









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









M:	Chris Li <chrisl@kernel.org>









M:	Kairui Song <kasong@tencent.com>









R:	Kemeng Shi <shikemeng@huaweicloud.com>









R:	Kairui Song <kasong@tencent.com>









R:	Nhat Pham <nphamcs@gmail.com>









R:	Baoquan He <bhe@redhat.com>









R:	Barry Song <baohua@kernel.org>









R:	Chris Li <chrisl@kernel.org>









L:	linux-mm@kvack.org









S:	Maintained









F:	Documentation/mm/swap-table.rst








@@ -20180,6 +20182,7 @@ R:	Alexander Shishkin <alexander.shishkin@linux.intel.com>







R:	Jiri Olsa <jolsa@kernel.org>









R:	Ian Rogers <irogers@google.com>









R:	Adrian Hunter <adrian.hunter@intel.com>









R:	James Clark <james.clark@linaro.org>









L:	linux-perf-users@vger.kernel.org









L:	linux-kernel@vger.kernel.org









S:	Supported