Commit 525b139f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge v6.14-rc6 into usb-next 



Resolves the merge conflict with:
	drivers/usb/typec/ucsi/ucsi_acpi.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents b331a3d8 80e54e84

.mailmap

+8 −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>
@@ -226,6 +225,7 @@ Fangrui Song <i@maskray.me> <maskray@google.com> 
Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>

Feng Tang <feng.79.tang@gmail.com> <feng.tang@intel.com>

Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>

Filipe Lautert <filipe@icewall.org>

Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
@@ -317,6 +317,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com> 
Jean Tourrilhes <jt@hpl.hp.com>

Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Jeff Johnson <jeff.johnson@oss.qualcomm.com> <jjohnson@codeaurora.org>

Jeff Johnson <jeff.johnson@oss.qualcomm.com> <quic_jjohnson@quicinc.com>

Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>

Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>

Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
@@ -519,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>
@@ -531,6 +534,7 @@ Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk> 
Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>

Nicholas Piggin <npiggin@gmail.com> <nickpiggin@yahoo.com.au>

Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au>

Nick Desaulniers <nick.desaulniers+lkml@gmail.com> <ndesaulniers@google.com>

Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>

Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>

Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
@@ -609,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>
@@ -685,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/arch/powerpc/cxl.rst

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Introduction 
    both access system memory directly and with the same effective

    addresses.



    **This driver is deprecated and will be removed in a future release.**



Hardware overview

=================
@@ -453,7 +454,7 @@ Sysfs Class 


    A cxl sysfs class is added under /sys/class/cxl to facilitate

    enumeration and tuning of the accelerators. Its layout is

    described in Documentation/ABI/testing/sysfs-class-cxl

    described in Documentation/ABI/obsolete/sysfs-class-cxl





Udev rules

Documentation/arch/x86/sva.rst

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ to cache translations for virtual addresses. The IOMMU driver uses the 
mmu_notifier() support to keep the device TLB cache and the CPU cache in

sync. When an ATS lookup fails for a virtual address, the device should

use the PRI in order to request the virtual address to be paged into the

CPU page tables. The device must use ATS again in order the fetch the

CPU page tables. The device must use ATS again in order to fetch the

translation before use.



Shared Hardware Workqueues
@@ -216,7 +216,7 @@ submitting work and processing completions. 


Single Root I/O Virtualization (SR-IOV) focuses on providing independent

hardware interfaces for virtualizing hardware. Hence, it's required to be

almost fully functional interface to software supporting the traditional

an almost fully functional interface to software supporting the traditional

BARs, space for interrupts via MSI-X, its own register layout.

Virtual Functions (VFs) are assisted by the Physical Function (PF)

driver.