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

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



drivers/ptp/Kconfig:
  55c8fca1 ("ptp_pch: Restore dependency on PCI")
  e5f31552 ("ethernet: fix PTP_1588_CLOCK dependencies")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9e5f10fe f87d6431

Documentation/devicetree/bindings/iio/st,st-sensors.yaml

+0 −41
Original line number Diff line number Diff line
@@ -152,47 +152,6 @@ allOf: 
          maxItems: 1

        st,drdy-int-pin: false



  - if:

      properties:

        compatible:

          enum:

            # Two intertial interrupts i.e. accelerometer/gyro interrupts

            - st,h3lis331dl-accel

            - st,l3g4200d-gyro

            - st,l3g4is-gyro

            - st,l3gd20-gyro

            - st,l3gd20h-gyro

            - st,lis2de12

            - st,lis2dw12

            - st,lis2hh12

            - st,lis2dh12-accel

            - st,lis331dl-accel

            - st,lis331dlh-accel

            - st,lis3de

            - st,lis3dh-accel

            - st,lis3dhh

            - st,lis3mdl-magn

            - st,lng2dm-accel

            - st,lps331ap-press

            - st,lsm303agr-accel

            - st,lsm303dlh-accel

            - st,lsm303dlhc-accel

            - st,lsm303dlm-accel

            - st,lsm330-accel

            - st,lsm330-gyro

            - st,lsm330d-accel

            - st,lsm330d-gyro

            - st,lsm330dl-accel

            - st,lsm330dl-gyro

            - st,lsm330dlc-accel

            - st,lsm330dlc-gyro

            - st,lsm9ds0-gyro

            - st,lsm9ds1-magn

    then:

      properties:

        interrupts:

          maxItems: 2



required:

  - compatible

  - reg

Documentation/i2c/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Introduction 
   busses/index

   i2c-topology

   muxes/i2c-mux-gpio

   i2c-sysfs



Writing device drivers

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

Documentation/virt/kvm/locking.rst

+4 −4
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ On x86: 


- vcpu->mutex is taken outside kvm->arch.hyperv.hv_lock



- kvm->arch.mmu_lock is an rwlock.  kvm->arch.tdp_mmu_pages_lock is

  taken inside kvm->arch.mmu_lock, and cannot be taken without already

  holding kvm->arch.mmu_lock (typically with ``read_lock``, otherwise

  there's no need to take kvm->arch.tdp_mmu_pages_lock at all).

- kvm->arch.mmu_lock is an rwlock.  kvm->arch.tdp_mmu_pages_lock and

  kvm->arch.mmu_unsync_pages_lock are taken inside kvm->arch.mmu_lock, and

  cannot be taken without already holding kvm->arch.mmu_lock (typically with

  ``read_lock`` for the TDP MMU, thus the need for additional spinlocks).



Everything else is a leaf: no other lock is taken inside the critical

sections.

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Opossums on Parade



# *DOCUMENTATION*

arch/arm64/kvm/arm.c

+8 −4
Original line number Diff line number Diff line
@@ -94,10 +94,14 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, 
		kvm->arch.return_nisv_io_abort_to_user = true;

		break;

	case KVM_CAP_ARM_MTE:

		if (!system_supports_mte() || kvm->created_vcpus)

			return -EINVAL;

		mutex_lock(&kvm->lock);

		if (!system_supports_mte() || kvm->created_vcpus) {

			r = -EINVAL;

		} else {

			r = 0;

			kvm->arch.mte_enabled = true;

		}

		mutex_unlock(&kvm->lock);

		break;

	default:

		r = -EINVAL;