Commit c924c5e9 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge net-next/main to resolve conflicts 



There are a few conflicts between the work that went
into wireless and that's here now, resolve them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 54be64fd 50698b29

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com> 
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>

Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>

Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>

Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>

Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>

Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>

Archit Taneja <archit@ti.com>
@@ -522,6 +521,7 @@ Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il> 
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>

Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>

Natalie Vock <natalie.vock@gmx.de> <friedrich.vock@gmx.de>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.ibm.com>

Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.vnet.ibm.com>
@@ -613,6 +613,8 @@ Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net> 
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>

Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>

Rodrigo Siqueira <siqueira@igalia.com> <Rodrigo.Siqueira@amd.com>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
@@ -689,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/devicetree/bindings/net/amlogic,meson-dwmac.yaml

+6 −0
Original line number Diff line number Diff line
@@ -152,6 +152,12 @@ properties: 
          The second range is is for the Amlogic specific configuration

          (for example the PRG_ETHERNET register range on Meson8b and newer)



  interrupts:

    maxItems: 1



  interrupt-names:

    const: macirq



required:

  - compatible

  - reg