Commit d2e11fd2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Conflicting commits, all resolutions pretty trivial:

drivers/bus/mhi/pci_generic.c
  5c2c8531 ("bus: mhi: pci-generic: configurable network interface MRU")
  56f6f4c4 ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean")

drivers/nfc/s3fwrn5/firmware.c
  a0302ff5 ("nfc: s3fwrn5: remove unnecessary label")
  46573e3a ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")

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

Documentation/arm64/tagged-address-abi.rst

+18 −8
Original line number Diff line number Diff line
@@ -45,8 +45,9 @@ how the user addresses are used by the kernel: 


1. User addresses not accessed by the kernel but used for address space

   management (e.g. ``mprotect()``, ``madvise()``). The use of valid

   tagged pointers in this context is allowed with the exception of

   ``brk()``, ``mmap()`` and the ``new_address`` argument to

   tagged pointers in this context is allowed with these exceptions:



   - ``brk()``, ``mmap()`` and the ``new_address`` argument to

     ``mremap()`` as these have the potential to alias with existing

      user addresses.
@@ -54,6 +55,15 @@ how the user addresses are used by the kernel: 
     incorrectly accept valid tagged pointers for the ``brk()``,

     ``mmap()`` and ``mremap()`` system calls.



   - The ``range.start``, ``start`` and ``dst`` arguments to the

     ``UFFDIO_*`` ``ioctl()``s used on a file descriptor obtained from

     ``userfaultfd()``, as fault addresses subsequently obtained by reading

     the file descriptor will be untagged, which may otherwise confuse

     tag-unaware programs.



     NOTE: This behaviour changed in v5.14 and so some earlier kernels may

     incorrectly accept valid tagged pointers for this system call.



2. User addresses accessed by the kernel (e.g. ``write()``). This ABI

   relaxation is disabled by default and the application thread needs to

   explicitly enable it via ``prctl()`` as follows:

Documentation/devicetree/bindings/sound/renesas,rsnd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ properties: 


  ports:

    $ref: /schemas/graph.yaml#/properties/ports

    properties:

    patternProperties:

      port(@[0-9a-f]+)?:

        $ref: audio-graph-port.yaml#

        unevaluatedProperties: false

Documentation/trace/histogram.rst

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ Documentation written by Tom Zanussi 
                                with the event, in nanoseconds.  May be

			        modified by .usecs to have timestamps

			        interpreted as microseconds.

    cpu                    int  the cpu on which the event occurred.

    common_cpu             int  the cpu on which the event occurred.

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



Extended error information

Documentation/virt/kvm/api.rst

+15 −15
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ in-kernel irqchip (GIC), and for in-kernel irqchip can tell the GIC to 
use PPIs designated for specific cpus.  The irq field is interpreted

like this::



  bits:  |  31 ... 28  | 27 ... 24 | 23  ... 16 | 15 ... 0 |

  bits:  |  31 ... 28  | 27 ... 24 | 23  ... 16 | 15 ... 0 |

  field: | vcpu2_index | irq_type  | vcpu_index |  irq_id  |



The irq_type field has the following values:
@@ -2149,10 +2149,10 @@ prior to calling the KVM_RUN ioctl. 
Errors:



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

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

           protected virtualization mode on s390

  EPERM    (arm64) register access not allowed before vcpu finalization

  EPERM    (arm64) register access not allowed before vcpu finalization

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



(These error codes are indicative only: do not rely on a specific error
@@ -2590,10 +2590,10 @@ following id bit patterns:: 
Errors include:



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

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

  ENOENT   no such register

  EINVAL   invalid register ID, or no such register or used with VMs in

           protected virtualization mode on s390

  EPERM    (arm64) register access not allowed before vcpu finalization

  EPERM    (arm64) register access not allowed before vcpu finalization

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



(These error codes are indicative only: do not rely on a specific error
@@ -3112,13 +3112,13 @@ current state. "addr" is ignored. 
Errors:



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

  EINVAL     the target is unknown, or the combination of features is invalid.

  ENOENT     a features bit specified is unknown.

  EINVAL     the target is unknown, or the combination of features is invalid.

  ENOENT     a features bit specified is unknown.

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



This tells KVM what type of CPU to present to the guest, and what

optional features it should have.  This will cause a reset of the cpu

registers to their initial values.  If this is not called, KVM_RUN will

optional features it should have.  This will cause a reset of the cpu

registers to their initial values.  If this is not called, KVM_RUN will

return ENOEXEC for that vcpu.



The initial values are defined as:
@@ -3239,8 +3239,8 @@ VCPU matching underlying host. 
Errors:



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

  E2BIG      the reg index list is too big to fit in the array specified by

             the user (the number required will be written into n).

  E2BIG      the reg index list is too big to fit in the array specified by

             the user (the number required will be written into n).

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



::
@@ -3288,7 +3288,7 @@ specific device. 
ARM/arm64 divides the id field into two parts, a device id and an

address type id specific to the individual device::



  bits:  | 63        ...       32 | 31    ...    16 | 15    ...    0 |

  bits:  | 63        ...       32 | 31    ...    16 | 15    ...    0 |

  field: |        0x00000000      |     device id   |  addr type id  |



ARM/arm64 currently only require this when using the in-kernel GIC
@@ -7049,7 +7049,7 @@ In combination with KVM_CAP_X86_USER_SPACE_MSR, this allows user space to 
trap and emulate MSRs that are outside of the scope of KVM as well as

limit the attack surface on KVM's MSR emulation code.



8.28 KVM_CAP_ENFORCE_PV_CPUID

8.28 KVM_CAP_ENFORCE_PV_FEATURE_CPUID

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



Architectures: x86

MAINTAINERS

+21 −5
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ F: drivers/platform/x86/wmi.c 
F:	include/uapi/linux/wmi.h









ACRN HYPERVISOR SERVICE MODULE









M:	Shuo Liu <shuo.a.liu@intel.com>









M:	Fei Li <fei1.li@intel.com>









L:	acrn-dev@lists.projectacrn.org (subscribers-only)









S:	Supported









W:	https://projectacrn.org








@@ -7859,9 +7859,9 @@ S:	Maintained







F:	drivers/input/touchscreen/goodix.c

















GOOGLE ETHERNET DRIVERS









M:	Catherine Sullivan <csully@google.com>









R:	Sagi Shahar <sagis@google.com>









R:	Jon Olson <jonolson@google.com>









M:	Jeroen de Borst <jeroendb@google.com>









R:	Catherine Sullivan <csully@google.com>









R:	David Awogbemila <awogbemila@google.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/networking/device_drivers/ethernet/google/gve.rst








@@ -11347,6 +11347,12 @@ L:	netdev@vger.kernel.org







S:	Supported









F:	drivers/net/phy/mxl-gpy.c

















MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER









R:	Yasushi SHOJI <yashi@spacecubics.com>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/usb/mcba_usb.c

















MCAN MMIO DEVICE DRIVER









M:	Chandrasekar Ramakrishnan <rcsekar@samsung.com>









L:	linux-can@vger.kernel.org








@@ -15488,6 +15494,8 @@ M:	Pan, Xinhui <Xinhui.Pan@amd.com>







L:	amd-gfx@lists.freedesktop.org









S:	Supported









T:	git https://gitlab.freedesktop.org/agd5f/linux.git









B:	https://gitlab.freedesktop.org/drm/amd/-/issues









C:	irc://irc.oftc.net/radeon









F:	drivers/gpu/drm/amd/









F:	drivers/gpu/drm/radeon/









F:	include/uapi/drm/amdgpu_drm.h








@@ -19143,7 +19151,7 @@ M:	Mauro Carvalho Chehab <mchehab@kernel.org>







L:	linux-usb@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml









F:	drivers/phy/hisilicon/phy-kirin970-usb3.c









F:	drivers/phy/hisilicon/phy-hi3670-usb3.c

















USB ISP116X DRIVER









M:	Olav Kongas <ok@artecdesign.ee>








@@ -19821,6 +19829,14 @@ L:	netdev@vger.kernel.org







S:	Supported









F:	drivers/ptp/ptp_vmw.c

















VMWARE VMCI DRIVER









M:	Jorgen Hansen <jhansen@vmware.com>









M:	Vishnu Dasa <vdasa@vmware.com>









L:	linux-kernel@vger.kernel.org









L:	pv-drivers@vmware.com (private)









S:	Maintained









F:	drivers/misc/vmw_vmci/

















VMWARE VMMOUSE SUBDRIVER









M:	"VMware Graphics" <linux-graphics-maintainer@vmware.com>









M:	"VMware, Inc." <pv-drivers@vmware.com>