Commit 4d012040 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.16-rc3 into usb-next 



We need the USB driver fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents c4bc515d d58071a8

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ Chao Yu <chao@kernel.org> <chao2.yu@samsung.com> 
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+6 −6
Original line number Diff line number Diff line
@@ -1520,15 +1520,15 @@ This sysfs attribute controls the keyboard "face" that will be shown on the 
Lenovo X1 Carbon 2nd gen (2014)'s adaptive keyboard. The value can be read

and set.



- 1 = Home mode

- 2 = Web-browser mode

- 3 = Web-conference mode

- 4 = Function mode

- 5 = Layflat mode

- 0 = Home mode

- 1 = Web-browser mode

- 2 = Web-conference mode

- 3 = Function mode

- 4 = Layflat mode



For more details about which buttons will appear depending on the mode, please

review the laptop's user guide:

http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf

https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles_pdf/x1carbon_2_ug_en.pdf



Battery charge control

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

Documentation/admin-guide/sysctl/kernel.rst

+1 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ task_delayacct 
===============



Enables/disables task delay accounting (see

:doc:`accounting/delay-accounting.rst`). Enabling this feature incurs

Documentation/accounting/delay-accounting.rst. Enabling this feature incurs

a small amount of overhead in the scheduler but is useful for debugging

and performance tuning. It is required by some tools such as iotop.

Documentation/arm/marvell.rst

+24 −24
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ Discovery family 


                Not supported by the Linux kernel.



  Homepage:

        https://web.archive.org/web/20110924171043/http://www.marvell.com/embedded-processors/discovery-innovation/

  Core:

	Feroceon 88fr571-vd ARMv5 compatible
@@ -120,6 +122,7 @@ EBU Armada family 
        - 88F6707

        - 88F6W11



    - Product infos:   https://web.archive.org/web/20141002083258/http://www.marvell.com/embedded-processors/armada-370/

    - Product Brief:   https://web.archive.org/web/20121115063038/http://www.marvell.com/embedded-processors/armada-300/assets/Marvell_ARMADA_370_SoC.pdf

    - Hardware Spec:   https://web.archive.org/web/20140617183747/http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-datasheet.pdf

    - Functional Spec: https://web.archive.org/web/20140617183701/http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-FunctionalSpec-datasheet.pdf
@@ -127,9 +130,29 @@ EBU Armada family 
  Core:

	Sheeva ARMv7 compatible PJ4B



  Armada XP Flavors:

        - MV78230

        - MV78260

        - MV78460



    NOTE:

	not to be confused with the non-SMP 78xx0 SoCs



    - Product infos:   https://web.archive.org/web/20150101215721/http://www.marvell.com/embedded-processors/armada-xp/

    - Product Brief:   https://web.archive.org/web/20121021173528/http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf

    - Functional Spec: https://web.archive.org/web/20180829171131/http://www.marvell.com/embedded-processors/armada-xp/assets/ARMADA-XP-Functional-SpecDatasheet.pdf

    - Hardware Specs:

        - https://web.archive.org/web/20141127013651/http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78230_OS.PDF

        - https://web.archive.org/web/20141222000224/http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78260_OS.PDF

        - https://web.archive.org/web/20141222000230/http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78460_OS.PDF



  Core:

	Sheeva ARMv7 compatible Dual-core or Quad-core PJ4B-MP



  Armada 375 Flavors:

	- 88F6720



    - Product infos: https://web.archive.org/web/20140108032402/http://www.marvell.com/embedded-processors/armada-375/

    - Product Brief: https://web.archive.org/web/20131216023516/http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA_375_SoC-01_product_brief.pdf



  Core:
@@ -162,29 +185,6 @@ EBU Armada family 
  Core:

	ARM Cortex-A9



  Armada XP Flavors:

        - MV78230

        - MV78260

        - MV78460



    NOTE:

	not to be confused with the non-SMP 78xx0 SoCs



    Product Brief:

	https://web.archive.org/web/20121021173528/http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf



    Functional Spec:

	https://web.archive.org/web/20180829171131/http://www.marvell.com/embedded-processors/armada-xp/assets/ARMADA-XP-Functional-SpecDatasheet.pdf



    - Hardware Specs:



        - https://web.archive.org/web/20141127013651/http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78230_OS.PDF

        - https://web.archive.org/web/20141222000224/http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78260_OS.PDF

        - https://web.archive.org/web/20141222000230/http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78460_OS.PDF



  Core:

	Sheeva ARMv7 compatible Dual-core or Quad-core PJ4B-MP



  Linux kernel mach directory:

	arch/arm/mach-mvebu

  Linux kernel plat directory:
@@ -436,7 +436,7 @@ Berlin family (Multimedia Solutions) 
  - Flavors:

	- 88DE3010, Armada 1000 (no Linux support)

		- Core:		Marvell PJ1 (ARMv5TE), Dual-core

		- Product Brief:	http://www.marvell.com.cn/digital-entertainment/assets/armada_1000_pb.pdf

		- Product Brief:	https://web.archive.org/web/20131103162620/http://www.marvell.com/digital-entertainment/assets/armada_1000_pb.pdf

	- 88DE3005, Armada 1500 Mini

		- Design name:	BG2CD

		- Core:		ARM Cortex-A9, PL310 L2CC

Documentation/bpf/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ that goes into great technical depth about the BPF Architecture. 
libbpf

======



Documentation/bpf/libbpf/libbpf.rst is a userspace library for loading and interacting with bpf programs.

Documentation/bpf/libbpf/index.rst is a userspace library for loading and interacting with bpf programs.



BPF Type Format (BTF)

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