Commit 941defce authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Cross-merge networking fixes after downstream PR (net-6.14-rc6).

Conflicts:

tools/testing/selftests/drivers/net/ping.py
  75cc19c8 ("selftests: drv-net: add xdp cases for ping.py")
  de94e869 ("selftests: drv-net: store addresses in dict indexed by ipver")
https://lore.kernel.org/netdev/20250311115758.17a1d414@canb.auug.org.au/

net/core/devmem.c
  a70f891e ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()")
  1d22d306 ("net: drop rtnl_lock for queue_mgmt operations")
https://lore.kernel.org/netdev/20250313114929.43744df1@canb.auug.org.au/



Adjacent changes:

tools/testing/selftests/net/Makefile
  6f50175c ("selftests: Add IPv6 link-local address generation tests for GRE devices.")
  2e5584e0 ("selftests/net: expand cmsg_ipv6.sh with ipv4")

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  66195855 ("eth: bnxt: do not use BNXT_VNIC_NTUPLE unconditionally in queue restart logic")
  fe96d717 ("bnxt_en: Extend queue stop/start for TX rings")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 89d75c4c 4003c9e7

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org> 
Subhash Jadavani <subhashj@codeaurora.org>

Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>

Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>

Sumit Semwal <sumit.semwal@ti.com>

Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>

Sven Eckelmann <sven@narfation.org> <seckelmann@datto.com>

Documentation/admin-guide/README.rst

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ Configuring the kernel 
                        values without prompting.



     "make defconfig"   Create a ./.config file by using the default

                        symbol values from either arch/$ARCH/defconfig

                        symbol values from either arch/$ARCH/configs/defconfig

                        or arch/$ARCH/configs/${PLATFORM}_defconfig,

                        depending on the architecture.

Documentation/admin-guide/sysctl/kernel.rst

+11 −0
Original line number Diff line number Diff line
@@ -212,6 +212,17 @@ pid>/``). 
This value defaults to 0.





core_sort_vma

=============



The default coredump writes VMAs in address order. By setting

``core_sort_vma`` to 1, VMAs will be written from smallest size

to largest size. This is known to break at least elfutils, but

can be handy when dealing with very large (and truncated)

coredumps where the more useful debugging details are included

in the smaller VMAs.





core_uses_pid

=============

Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ properties: 
    maxItems: 2



  pwm-names:

    minItems: 1

    items:

      - const: convst1

      - const: convst2

Documentation/scheduler/sched-rt-group.rst

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ The system wide settings are configured under the /proc virtual file system: 
  * sched_rt_period_us takes values from 1 to INT_MAX.

  * sched_rt_runtime_us takes values from -1 to sched_rt_period_us.

  * A run time of -1 specifies runtime == period, ie. no limit.

  * sched_rt_runtime_us/sched_rt_period_us > 0.05 inorder to preserve

    bandwidth for fair dl_server. For accurate value check average of

    runtime/period in /sys/kernel/debug/sched/fair_server/cpuX/





2.2 Default behaviour