Commit e47b68bd authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc5+ 



Cross-merge BPF and other fixes after downstream PR.

Minor conflict in kernel/bpf/helpers.c

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents ef2c0b2e 7a0892d2

.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/sound/codecs/cs35l56.rst

+4 −5
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ In this example the SSID is 10280c63. 


The format of the firmware file names is:



SoundWire (except CS35L56 Rev B0):

SoundWire:

    cs35lxx-b0-dsp1-misc-SSID[-spkidX]-l?u?



SoundWire CS35L56 Rev B0:

SoundWire CS35L56 Rev B0 firmware released before kernel version 6.16:

    cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN



Non-SoundWire (HDA and I2S):
@@ -127,9 +127,8 @@ Where: 
  * spkidX is an optional part, used for laptops that have firmware

    configurations for different makes and models of internal speakers.



The CS35L56 Rev B0 continues to use the old filename scheme because a

large number of firmware files have already been published with these

names.

Early firmware for CS35L56 Rev B0 used the ALSA prefix (ampN) as the

filename qualifier. Support for the l?u? qualifier was added in kernel 6.16.



Sound Open Firmware and ALSA topology files

-------------------------------------------

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``