Skip to content

Commit 10c3436

Browse files
committed
Merge branch 'sound/upstream-20201027' into merge/sound-upstream-20201027
2 parents 8290bd6 + 11811d6 commit 10c3436

File tree

13,309 files changed

+567394
-292089
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,309 files changed

+567394
-292089
lines changed

.clang-format

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,13 @@ ForEachMacros:
203203
- 'for_each_matching_node'
204204
- 'for_each_matching_node_and_match'
205205
- 'for_each_member'
206-
- 'for_each_memblock'
206+
- 'for_each_mem_region'
207207
- 'for_each_memblock_type'
208208
- 'for_each_memcg_cache_index'
209209
- 'for_each_mem_pfn_range'
210+
- '__for_each_mem_range'
210211
- 'for_each_mem_range'
212+
- '__for_each_mem_range_rev'
211213
- 'for_each_mem_range_rev'
212214
- 'for_each_migratetype_order'
213215
- 'for_each_msi_entry'
@@ -271,6 +273,7 @@ ForEachMacros:
271273
- 'for_each_registered_fb'
272274
- 'for_each_requested_gpio'
273275
- 'for_each_requested_gpio_in_range'
276+
- 'for_each_reserved_mem_range'
274277
- 'for_each_reserved_mem_region'
275278
- 'for_each_rtd_codec_dais'
276279
- 'for_each_rtd_codec_dais_rollback'
@@ -426,6 +429,7 @@ ForEachMacros:
426429
- 'rbtree_postorder_for_each_entry_safe'
427430
- 'rdma_for_each_block'
428431
- 'rdma_for_each_port'
432+
- 'rdma_umem_for_each_dma_block'
429433
- 'resource_list_for_each_entry'
430434
- 'resource_list_for_each_entry_safe'
431435
- 'rhl_for_each_entry_rcu'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,6 @@ x509.genkey
152152

153153
# Clang's compilation database file
154154
/compile_commands.json
155+
156+
# Documentation toolchain
157+
sphinx_*/

.mailmap

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
4141
Andrew Vasquez <andrew.vasquez@qlogic.com>
4242
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
4343
Andy Adamson <andros@citi.umich.edu>
44-
Antoine Tenart <antoine.tenart@free-electrons.com>
44+
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
45+
Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
4546
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
4647
Archit Taneja <archit@ti.com>
4748
Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
@@ -132,6 +133,7 @@ James Ketrenos <jketreno@io.(none)>
132133
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
133134
Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
134135
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
136+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
135137
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
136138
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
137139
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -188,13 +190,15 @@ Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
188190
Linas Vepstas <linas@austin.ibm.com>
189191
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
190192
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
193+
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
191194
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
192195
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
193196
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
194197
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
195198
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
196199
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
197200
Mark Brown <broonie@sirena.org.uk>
201+
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
198202
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
199203
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
200204
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ N: Krishna Balasubramanian
191191
E: balasub@cis.ohio-state.edu
192192
D: Wrote SYS V IPC (part of standard kernel since 0.99.10)
193193

194+
B: Robert Baldyga
195+
E: r.baldyga@hackerion.com
196+
D: Samsung S3FWRN5 NCI NFC Controller
197+
194198
N: Chris Ball
195199
E: chris@printf.net
196200
D: Former maintainer of the MMC/SD/SDIO subsystem.
@@ -1942,6 +1946,10 @@ S: Post Office Box 611311
19421946
S: San Jose, California 95161-1311
19431947
S: USA
19441948

1949+
N: Hartmut Knaack
1950+
E: knaack.h@gmx.de
1951+
D: IIO subsystem and drivers
1952+
19451953
N: Thorsten Knabe
19461954
E: Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>
19471955
E: Thorsten Knabe <tek01@hrzpub.tu-darmstadt.de>

Documentation/ABI/obsolete/sysfs-selinux-checkreqprot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Description:
1515
actual protection), and Android and Linux distributions have been
1616
explicitly writing a "0" to /sys/fs/selinux/checkreqprot during
1717
initialization for some time. Support for setting checkreqprot to 1
18-
will be removed in a future kernel release, at which point the kernel
18+
will be removed no sooner than June 2021, at which point the kernel
1919
will always cease using checkreqprot internally and will always
2020
check the actual protections being applied upon mmap/mprotect calls.
2121
The checkreqprot selinuxfs node will remain for backward compatibility
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/bus/mhi/devices/.../serialnumber
2+
Date: Sept 2020
3+
KernelVersion: 5.10
4+
Contact: Bhaumik Bhatt <bbhatt@codeaurora.org>
5+
Description: The file holds the serial number of the client device obtained
6+
using a BHI (Boot Host Interface) register read after at least
7+
one attempt to power up the device has been done. If read
8+
without having the device power on at least once, the file will
9+
read all 0's.
10+
Users: Any userspace application or clients interested in device info.
11+
12+
What: /sys/bus/mhi/devices/.../oem_pk_hash
13+
Date: Sept 2020
14+
KernelVersion: 5.10
15+
Contact: Bhaumik Bhatt <bbhatt@codeaurora.org>
16+
Description: The file holds the OEM PK Hash value of the endpoint device
17+
obtained using a BHI (Boot Host Interface) register read after
18+
at least one attempt to power up the device has been done. If
19+
read without having the device power on at least once, the file
20+
will read all 0's.
21+
Users: Any userspace application or clients interested in device info.

Documentation/ABI/stable/sysfs-class-infiniband

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -258,23 +258,6 @@ Description:
258258
userspace ABI compatibility of umad & issm devices.
259259

260260

261-
What: /sys/class/infiniband_cm/ucmN/ibdev
262-
Date: Oct, 2005
263-
KernelVersion: v2.6.14
264-
Contact: linux-rdma@vger.kernel.org
265-
Description:
266-
(RO) Display Infiniband (IB) device name
267-
268-
269-
What: /sys/class/infiniband_cm/abi_version
270-
Date: Oct, 2005
271-
KernelVersion: v2.6.14
272-
Contact: linux-rdma@vger.kernel.org
273-
Description:
274-
(RO) Value is incremented if any changes are made that break
275-
userspace ABI compatibility of ucm devices.
276-
277-
278261
What: /sys/class/infiniband_verbs/uverbsN/ibdev
279262
What: /sys/class/infiniband_verbs/uverbsN/abi_version
280263
Date: Sept, 2005

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ Description: The maximum number of bandwidth tokens that may be in use at
116116
one time by operations that access low bandwidth memory in the
117117
device.
118118

119+
What: /sys/bus/dsa/devices/dsa<m>/cmd_status
120+
Date: Aug 28, 2020
121+
KernelVersion: 5.10.0
122+
Contact: dmaengine@vger.kernel.org
123+
Description: The last executed device administrative command's status/error.
124+
119125
What: /sys/bus/dsa/devices/wq<m>.<n>/group_id
120126
Date: Oct 25, 2019
121127
KernelVersion: 5.6.0
@@ -170,6 +176,20 @@ Contact: dmaengine@vger.kernel.org
170176
Description: The number of entries in this work queue that may be filled
171177
via a limited portal.
172178

179+
What: /sys/bus/dsa/devices/wq<m>.<n>/max_transfer_size
180+
Date: Aug 28, 2020
181+
KernelVersion: 5.10.0
182+
Contact: dmaengine@vger.kernel.org
183+
Description: The max transfer sized for this workqueue. Cannot exceed device
184+
max transfer size. Configurable parameter.
185+
186+
What: /sys/bus/dsa/devices/wq<m>.<n>/max_batch_size
187+
Date: Aug 28, 2020
188+
KernelVersion: 5.10.0
189+
Contact: dmaengine@vger.kernel.org
190+
Description: The max batch size for this workqueue. Cannot exceed device
191+
max batch size. Configurable parameter.
192+
173193
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
174194
Date: Oct 25, 2019
175195
KernelVersion: 5.6.0
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
What: /sys/kernel/notes
2+
Date: July 2009
3+
Contact: <linux-kernel@vger.kernel.org>
4+
Description: The /sys/kernel/notes file contains the binary representation
5+
of the running vmlinux's .notes section.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/dfl/devices/dfl_dev.X/type
2+
Date: Aug 2020
3+
KernelVersion: 5.10
4+
Contact: Xu Yilun <yilun.xu@intel.com>
5+
Description: Read-only. It returns type of DFL FIU of the device. Now DFL
6+
supports 2 FIU types, 0 for FME, 1 for PORT.
7+
Format: 0x%x
8+
9+
What: /sys/bus/dfl/devices/dfl_dev.X/feature_id
10+
Date: Aug 2020
11+
KernelVersion: 5.10
12+
Contact: Xu Yilun <yilun.xu@intel.com>
13+
Description: Read-only. It returns feature identifier local to its DFL FIU
14+
type.
15+
Format: 0x%x

0 commit comments

Comments
 (0)