Commit 5ef04a7b 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-rc5).

No conflicts.

Adjacent changes:

include/net/sock.h
  c51613fa ("net: add sk->sk_drop_counters")
  5d6b58c9 ("net: lockless sock_i_ino()")

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

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com> 
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>

Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba> <nobuhiro1.iwamatsu@toshiba.co.jp>

Odelu Kukatla <quic_okukatla@quicinc.com> <okukatla@codeaurora.org>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Documentation/admin-guide/hw-vuln/attack_vector_controls.rst

+1 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ Spectre_v2 X X 
Spectre_v2_user                      X                           X            *       (Note 1)

SRBDS                 X              X            X              X

SRSO                  X              X            X              X

SSB                                                                                   (Note 4)

SSB                                  X

TAA                   X              X            X              X            *       (Note 2)

TSA                   X              X            X              X

=============== ============== ============ ============= ============== ============ ========
@@ -229,9 +229,6 @@ Notes: 
   3 --  Disables SMT if cross-thread mitigations are fully enabled, the CPU is

   vulnerable, and STIBP is not supported



   4 --  Speculative store bypass is always enabled by default (no kernel

   mitigation applied) unless overridden with spec_store_bypass_disable option



When an attack-vector is disabled, all mitigations for the vulnerabilities

listed in the above table are disabled, unless mitigation is required for a

different enabled attack-vector or a mitigation is explicitly selected via a

Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ properties: 
          - const: bus

          - const: core

          - const: vsync

          - const: lut

          - const: tbu

          - const: tbu_rt

        # MSM8996 has additional iommu clock

Documentation/networking/napi.rst

+2 −3
Original line number Diff line number Diff line
@@ -433,9 +433,8 @@ Threaded NAPI 


Threaded NAPI is an operating mode that uses dedicated kernel

threads rather than software IRQ context for NAPI processing.

The configuration is per netdevice and will affect all

NAPI instances of that device. Each NAPI instance will spawn a separate

thread (called ``napi/${ifc-name}-${napi-id}``).

Each threaded NAPI instance will spawn a separate thread

(called ``napi/${ifc-name}-${napi-id}``).



It is recommended to pin each kernel thread to a single CPU, the same

CPU as the CPU which services the interrupt. Note that the mapping

Documentation/sound/alsa-configuration.rst

+25 −4
Original line number Diff line number Diff line
@@ -2253,8 +2253,15 @@ device_setup 
    Default: 0x0000 

ignore_ctl_error

    Ignore any USB-controller regarding mixer interface (default: no)

    ``ignore_ctl_error=1`` may help when you get an error at accessing

    the mixer element such as URB error -22.  This happens on some

    buggy USB device or the controller.  This workaround corresponds to

    the ``quirk_flags`` bit 14, too.

autoclock

    Enable auto-clock selection for UAC2 devices (default: yes)

lowlatency

    Enable low latency playback mode (default: yes).

    Could disable it to switch back to the old mode if face a regression.

quirk_alias

    Quirk alias list, pass strings like ``0123abcd:5678beef``, which

    applies the existing quirk for the device 5678:beef to a new
@@ -2284,6 +2291,11 @@ delayed_register 
    The driver prints a message like "Found post-registration device

    assignment: 1234abcd:04" for such a device, so that user can

    notice the need.

skip_validation

    Skip unit descriptor validation (default: no).

    The option is used to ignores 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

    Contains the bit flags for various device specific workarounds.

    Applied to the corresponding card index.
@@ -2307,6 +2319,16 @@ quirk_flags 
        * bit 16: Set up the interface at first like UAC1

        * bit 17: Apply the generic implicit feedback sync mode

        * bit 18: Don't apply implicit feedback sync mode

        * bit 19: Don't closed interface during setting sample rate

        * bit 20: Force an interface reset whenever stopping & restarting

          a stream

        * bit 21: Do not set PCM rate (frequency) when only one rate is

          available for the given endpoint.

        * bit 22: Set the fixed resolution 16 for Mic Capture Volume

        * bit 23: Set the fixed resolution 384 for Mic Capture Volume

        * bit 24: Set minimum volume control value as mute for devices

          where the lowest playback value represents muted state instead

          of minimum audible volume



This module supports multiple devices, autoprobe and hotplugging.
@@ -2314,10 +2336,9 @@ NB: ``nrpacks`` parameter can be modified dynamically via sysfs. 
Don't put the value over 20.  Changing via sysfs has no sanity

check.



NB: ``ignore_ctl_error=1`` may help when you get an error at accessing

the mixer element such as URB error -22.  This happens on some

buggy USB device or the controller.  This workaround corresponds to

the ``quirk_flags`` bit 14, too.

NB: ``ignore_ctl_error=1`` just provides a quick way to work around the

issues.  If you have a buggy device that requires these quirks, please

report it to the upstream.



NB: ``quirk_alias`` option is provided only for testing / development.

If you want to have a proper support, contact to upstream for