Commit f4335950 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.3-rc4' of... 

Merge tag 'asoc-fix-v6.3-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.3

More fixes for v6.3, plus a few new trivial device ID additions.
Almost all of this is for the Intel drivers, though there is one
core fix from Shengjiu which ensures that format constraints are
correctly applied in some cases where they were missed.
parents 9fdc1605 e3720f92

.mailmap

+9 −1
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com> 
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>
@@ -306,6 +309,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> 
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>
@@ -411,7 +416,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>

Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>

Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>

Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>

Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>

Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

Documentation/ABI/stable/sysfs-block

+9 −0
Original line number Diff line number Diff line
@@ -705,6 +705,15 @@ Description: 
		zoned will report "none".





What:		/sys/block/<disk>/hidden

Date:		March 2023

Contact:	linux-block@vger.kernel.org

Description:

		[RO] the block device is hidden. it doesn’t produce events, and

		can’t be opened from userspace or using blkdev_get*.

		Used for the underlying components of multipath devices.





What:		/sys/block/<disk>/stat

Date:		February 2008

Contact:	Jerome Marchand <jmarchan@redhat.com>

Documentation/bpf/bpf_devel_QA.rst

+5 −9
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ workflows related to reporting bugs, submitting patches, and queueing 
patches for stable kernels.



For general information about submitting patches, please refer to

`Documentation/process/`_. This document only describes additional specifics

related to BPF.

Documentation/process/submitting-patches.rst. This document only describes

additional specifics related to BPF.



.. contents::

    :local:
@@ -461,15 +461,15 @@ needed:: 


  $ sudo make run_tests



See the kernels selftest `Documentation/dev-tools/kselftest.rst`_

document for further documentation.

See :doc:`kernel selftest documentation </dev-tools/kselftest>`

for details.



To maximize the number of tests passing, the .config of the kernel

under test should match the config file fragment in

tools/testing/selftests/bpf as closely as possible.



Finally to ensure support for latest BPF Type Format features -

discussed in `Documentation/bpf/btf.rst`_ - pahole version 1.16

discussed in Documentation/bpf/btf.rst - pahole version 1.16

is required for kernels built with CONFIG_DEBUG_INFO_BTF=y.

pahole is delivered in the dwarves package or can be built

from source at
@@ -684,12 +684,8 @@ when: 




.. Links

.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/

.. _netdev-FAQ: Documentation/process/maintainer-netdev.rst

.. _selftests:

   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/

.. _Documentation/dev-tools/kselftest.rst:

   https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html

.. _Documentation/bpf/btf.rst: btf.rst



Happy BPF hacking!

Documentation/filesystems/ext4/blockgroup.rst

+3 −3
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ descriptors. Instead, the superblock and a single block group descriptor 
block is placed at the beginning of the first, second, and last block

groups in a meta-block group. A meta-block group is a collection of

block groups which can be described by a single block group descriptor

block. Since the size of the block group descriptor structure is 32

bytes, a meta-block group contains 32 block groups for filesystems with

a 1KB block size, and 128 block groups for filesystems with a 4KB

block. Since the size of the block group descriptor structure is 64

bytes, a meta-block group contains 16 block groups for filesystems with

a 1KB block size, and 64 block groups for filesystems with a 4KB

blocksize. Filesystems can either be created using this new block group

descriptor layout, or existing filesystems can be resized on-line, and

the field s_first_meta_bg in the superblock will indicate the first

Documentation/netlink/genetlink-c.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

%YAML 1.2

---

$id: http://kernel.org/schemas/netlink/genetlink-c.yaml#