Skip to content

Commit c26137d

Browse files
committed
regmap: Merge up v7.0-rc2
This gets us a fix for KUnit execution which allows us to run the testsuite again.
2 parents 9ab637a + 11439c4 commit c26137d

472 files changed

Lines changed: 5122 additions & 2458 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,12 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
210210
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
211211
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
212212
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
213+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linaro.org>
214+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@free.fr>
215+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linexp.org>
216+
Daniel Lezcano <daniel.lezcano@kernel.org> <dlezcano@fr.ibm.com>
213217
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
218+
Daniele Alessandrelli <daniele.alessandrelli@gmail.com> <daniele.alessandrelli@intel.com>
214219
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
215220
David Brownell <david-b@pacbell.net>
216221
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
@@ -876,6 +881,7 @@ Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
876881
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
877882
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
878883
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
884+
Vlastimil Babka <vbabka@kernel.org> <vbabka@suse.cz>
879885
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
880886
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
881887
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
@@ -890,7 +896,8 @@ Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
890896
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
891897
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
892898
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
893-
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
899+
Yosry Ahmed <yosry@kernel.org> <yosryahmed@google.com>
900+
Yosry Ahmed <yosry@kernel.org> <yosry.ahmed@linux.dev>
894901
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
895902
Yusuke Goda <goda.yusuke@renesas.com>
896903
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

Documentation/admin-guide/sysctl/net.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,9 @@ Values:
594594
their sockets will only be able to connect within their own
595595
namespace.
596596

597+
The first write to ``child_ns_mode`` locks its value. Subsequent writes of the
598+
same value succeed, but writing a different value returns ``-EBUSY``.
599+
597600
Changing ``child_ns_mode`` only affects namespaces created after the change;
598601
it does not modify the current namespace or any existing children.
599602

Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ examples:
287287
regulator-max-microvolt = <1700000>;
288288
};
289289
mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 {
290-
regulator-name = "vrfck";
290+
regulator-name = "vrfck_1";
291291
regulator-min-microvolt = <1240000>;
292292
regulator-max-microvolt = <1600000>;
293293
};
@@ -309,7 +309,7 @@ examples:
309309
regulator-max-microvolt = <3300000>;
310310
};
311311
mt6359_vemc_1_ldo_reg: ldo_vemc_1 {
312-
regulator-name = "vemc";
312+
regulator-name = "vemc_1";
313313
regulator-min-microvolt = <2500000>;
314314
regulator-max-microvolt = <3300000>;
315315
};

Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,6 @@ allOf:
2222
properties:
2323
reg:
2424
minItems: 2
25-
- if:
26-
properties:
27-
compatible:
28-
contains:
29-
enum:
30-
- baikal,bt1-sys-ssi
31-
then:
32-
properties:
33-
mux-controls:
34-
maxItems: 1
35-
required:
36-
- mux-controls
37-
else:
38-
required:
39-
- interrupts
4025
- if:
4126
properties:
4227
compatible:
@@ -75,10 +60,6 @@ properties:
7560
const: intel,mountevans-imc-ssi
7661
- description: AMD Pensando Elba SoC SPI Controller
7762
const: amd,pensando-elba-spi
78-
- description: Baikal-T1 SPI Controller
79-
const: baikal,bt1-ssi
80-
- description: Baikal-T1 System Boot SPI Controller
81-
const: baikal,bt1-sys-ssi
8263
- description: Canaan Kendryte K210 SoS SPI Controller
8364
const: canaan,k210-spi
8465
- description: Renesas RZ/N1 SPI Controller
@@ -170,6 +151,7 @@ required:
170151
- "#address-cells"
171152
- "#size-cells"
172153
- clocks
154+
- interrupts
173155

174156
examples:
175157
- |
@@ -190,15 +172,4 @@ examples:
190172
rx-sample-delay-ns = <7>;
191173
};
192174
};
193-
- |
194-
spi@1f040100 {
195-
compatible = "baikal,bt1-sys-ssi";
196-
reg = <0x1f040100 0x900>,
197-
<0x1c000000 0x1000000>;
198-
#address-cells = <1>;
199-
#size-cells = <0>;
200-
mux-controls = <&boot_mux>;
201-
clocks = <&ccu_sys>;
202-
clock-names = "ssi_clk";
203-
};
204175
...

Documentation/virt/kvm/api.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,10 @@ or its flags may be modified, but it may not be resized.
13961396
Memory for the region is taken starting at the address denoted by the
13971397
field userspace_addr, which must point at user addressable memory for
13981398
the entire memory slot size. Any object may back this memory, including
1399-
anonymous memory, ordinary files, and hugetlbfs.
1399+
anonymous memory, ordinary files, and hugetlbfs. Changes in the backing
1400+
of the memory region are automatically reflected into the guest.
1401+
For example, an mmap() that affects the region will be made visible
1402+
immediately. Another example is madvise(MADV_DROP).
14001403

14011404
On architectures that support a form of address tagging, userspace_addr must
14021405
be an untagged address.
@@ -1412,11 +1415,6 @@ use it. The latter can be set, if KVM_CAP_READONLY_MEM capability allows it,
14121415
to make a new slot read-only. In this case, writes to this memory will be
14131416
posted to userspace as KVM_EXIT_MMIO exits.
14141417

1415-
When the KVM_CAP_SYNC_MMU capability is available, changes in the backing of
1416-
the memory region are automatically reflected into the guest. For example, an
1417-
mmap() that affects the region will be made visible immediately. Another
1418-
example is madvise(MADV_DROP).
1419-
14201418
For TDX guest, deleting/moving memory region loses guest memory contents.
14211419
Read only region isn't supported. Only as-id 0 is supported.
14221420

MAINTAINERS

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,6 @@ F: include/trace/events/amdxdna.h
12921292
F: include/uapi/drm/amdxdna_accel.h
12931293

12941294
AMD XGBE DRIVER
1295-
M: "Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>
12961295
M: Raju Rangoju <Raju.Rangoju@amd.com>
12971296
L: netdev@vger.kernel.org
12981297
S: Maintained
@@ -6213,20 +6212,20 @@ F: drivers/scsi/fnic/
62136212

62146213
CISCO SCSI HBA DRIVER
62156214
M: Karan Tilak Kumar <kartilak@cisco.com>
6215+
M: Narsimhulu Musini <nmusini@cisco.com>
62166216
M: Sesidhar Baddela <sebaddel@cisco.com>
62176217
L: linux-scsi@vger.kernel.org
62186218
S: Supported
62196219
F: drivers/scsi/snic/
62206220

62216221
CISCO VIC ETHERNET NIC DRIVER
6222-
M: Christian Benvenuti <benve@cisco.com>
62236222
M: Satish Kharat <satishkh@cisco.com>
62246223
S: Maintained
62256224
F: drivers/net/ethernet/cisco/enic/
62266225

62276226
CISCO VIC LOW LATENCY NIC DRIVER
6228-
M: Christian Benvenuti <benve@cisco.com>
62296227
M: Nelson Escobar <neescoba@cisco.com>
6228+
M: Satish Kharat <satishkh@cisco.com>
62306229
S: Supported
62316230
F: drivers/infiniband/hw/usnic/
62326231

@@ -6280,7 +6279,7 @@ S: Maintained
62806279
F: include/linux/clk.h
62816280

62826281
CLOCKSOURCE, CLOCKEVENT DRIVERS
6283-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6282+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
62846283
M: Thomas Gleixner <tglx@kernel.org>
62856284
L: linux-kernel@vger.kernel.org
62866285
S: Supported
@@ -6669,7 +6668,7 @@ F: rust/kernel/cpu.rs
66696668

66706669
CPU IDLE TIME MANAGEMENT FRAMEWORK
66716670
M: "Rafael J. Wysocki" <rafael@kernel.org>
6672-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6671+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
66736672
R: Christian Loehle <christian.loehle@arm.com>
66746673
L: linux-pm@vger.kernel.org
66756674
S: Maintained
@@ -6699,15 +6698,15 @@ F: arch/x86/kernel/msr.c
66996698

67006699
CPUIDLE DRIVER - ARM BIG LITTLE
67016700
M: Lorenzo Pieralisi <lpieralisi@kernel.org>
6702-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6701+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
67036702
L: linux-pm@vger.kernel.org
67046703
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
67056704
S: Maintained
67066705
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
67076706
F: drivers/cpuidle/cpuidle-big_little.c
67086707

67096708
CPUIDLE DRIVER - ARM EXYNOS
6710-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6709+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
67116710
M: Kukjin Kim <kgene@kernel.org>
67126711
R: Krzysztof Kozlowski <krzk@kernel.org>
67136712
L: linux-pm@vger.kernel.org
@@ -14412,9 +14411,9 @@ LANTIQ PEF2256 DRIVER
1441214411
M: Herve Codina <herve.codina@bootlin.com>
1441314412
S: Maintained
1441414413
F: Documentation/devicetree/bindings/net/lantiq,pef2256.yaml
14415-
F: drivers/net/wan/framer/pef2256/
14414+
F: drivers/net/wan/framer/
1441614415
F: drivers/pinctrl/pinctrl-pef2256.c
14417-
F: include/linux/framer/pef2256.h
14416+
F: include/linux/framer/
1441814417

1441914418
LASI 53c700 driver for PARISC
1442014419
M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
@@ -16656,7 +16655,7 @@ M: Andrew Morton <akpm@linux-foundation.org>
1665616655
M: David Hildenbrand <david@kernel.org>
1665716656
R: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
1665816657
R: Liam R. Howlett <Liam.Howlett@oracle.com>
16659-
R: Vlastimil Babka <vbabka@suse.cz>
16658+
R: Vlastimil Babka <vbabka@kernel.org>
1666016659
R: Mike Rapoport <rppt@kernel.org>
1666116660
R: Suren Baghdasaryan <surenb@google.com>
1666216661
R: Michal Hocko <mhocko@suse.com>
@@ -16786,7 +16785,7 @@ M: Andrew Morton <akpm@linux-foundation.org>
1678616785
M: David Hildenbrand <david@kernel.org>
1678716786
R: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
1678816787
R: Liam R. Howlett <Liam.Howlett@oracle.com>
16789-
R: Vlastimil Babka <vbabka@suse.cz>
16788+
R: Vlastimil Babka <vbabka@kernel.org>
1679016789
R: Mike Rapoport <rppt@kernel.org>
1679116790
R: Suren Baghdasaryan <surenb@google.com>
1679216791
R: Michal Hocko <mhocko@suse.com>
@@ -16841,7 +16840,7 @@ F: mm/oom_kill.c
1684116840

1684216841
MEMORY MANAGEMENT - PAGE ALLOCATOR
1684316842
M: Andrew Morton <akpm@linux-foundation.org>
16844-
M: Vlastimil Babka <vbabka@suse.cz>
16843+
M: Vlastimil Babka <vbabka@kernel.org>
1684516844
R: Suren Baghdasaryan <surenb@google.com>
1684616845
R: Michal Hocko <mhocko@suse.com>
1684716846
R: Brendan Jackman <jackmanb@google.com>
@@ -16887,7 +16886,7 @@ M: David Hildenbrand <david@kernel.org>
1688716886
M: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
1688816887
R: Rik van Riel <riel@surriel.com>
1688916888
R: Liam R. Howlett <Liam.Howlett@oracle.com>
16890-
R: Vlastimil Babka <vbabka@suse.cz>
16889+
R: Vlastimil Babka <vbabka@kernel.org>
1689116890
R: Harry Yoo <harry.yoo@oracle.com>
1689216891
R: Jann Horn <jannh@google.com>
1689316892
L: linux-mm@kvack.org
@@ -16986,7 +16985,7 @@ MEMORY MAPPING
1698616985
M: Andrew Morton <akpm@linux-foundation.org>
1698716986
M: Liam R. Howlett <Liam.Howlett@oracle.com>
1698816987
M: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
16989-
R: Vlastimil Babka <vbabka@suse.cz>
16988+
R: Vlastimil Babka <vbabka@kernel.org>
1699016989
R: Jann Horn <jannh@google.com>
1699116990
R: Pedro Falcato <pfalcato@suse.de>
1699216991
L: linux-mm@kvack.org
@@ -17016,7 +17015,7 @@ M: Andrew Morton <akpm@linux-foundation.org>
1701617015
M: Suren Baghdasaryan <surenb@google.com>
1701717016
M: Liam R. Howlett <Liam.Howlett@oracle.com>
1701817017
M: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
17019-
R: Vlastimil Babka <vbabka@suse.cz>
17018+
R: Vlastimil Babka <vbabka@kernel.org>
1702017019
R: Shakeel Butt <shakeel.butt@linux.dev>
1702117020
L: linux-mm@kvack.org
1702217021
S: Maintained
@@ -17032,7 +17031,7 @@ M: Andrew Morton <akpm@linux-foundation.org>
1703217031
M: Liam R. Howlett <Liam.Howlett@oracle.com>
1703317032
M: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
1703417033
M: David Hildenbrand <david@kernel.org>
17035-
R: Vlastimil Babka <vbabka@suse.cz>
17034+
R: Vlastimil Babka <vbabka@kernel.org>
1703617035
R: Jann Horn <jannh@google.com>
1703717036
L: linux-mm@kvack.org
1703817037
S: Maintained
@@ -20509,7 +20508,7 @@ F: Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
2050920508
F: drivers/pci/controller/dwc/pcie-kirin.c
2051020509

2051120510
PCIE DRIVER FOR HISILICON STB
20512-
M: Shawn Guo <shawn.guo@linaro.org>
20511+
M: Shawn Guo <shawnguo@kernel.org>
2051320512
L: linux-pci@vger.kernel.org
2051420513
S: Maintained
2051520514
F: Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
@@ -21695,7 +21694,7 @@ S: Maintained
2169521694
F: drivers/net/ethernet/qualcomm/emac/
2169621695

2169721696
QUALCOMM ETHQOS ETHERNET DRIVER
21698-
M: Vinod Koul <vkoul@kernel.org>
21697+
M: Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>
2169921698
L: netdev@vger.kernel.org
2170021699
L: linux-arm-msm@vger.kernel.org
2170121700
S: Maintained
@@ -23174,7 +23173,7 @@ K: \b(?i:rust)\b
2317423173
RUST [ALLOC]
2317523174
M: Danilo Krummrich <dakr@kernel.org>
2317623175
R: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
23177-
R: Vlastimil Babka <vbabka@suse.cz>
23176+
R: Vlastimil Babka <vbabka@kernel.org>
2317823177
R: Liam R. Howlett <Liam.Howlett@oracle.com>
2317923178
R: Uladzislau Rezki <urezki@gmail.com>
2318023179
L: rust-for-linux@vger.kernel.org
@@ -24350,7 +24349,7 @@ F: Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml
2435024349
F: drivers/nvmem/layouts/sl28vpd.c
2435124350

2435224351
SLAB ALLOCATOR
24353-
M: Vlastimil Babka <vbabka@suse.cz>
24352+
M: Vlastimil Babka <vbabka@kernel.org>
2435424353
M: Andrew Morton <akpm@linux-foundation.org>
2435524354
R: Christoph Lameter <cl@gentwo.org>
2435624355
R: David Rientjes <rientjes@google.com>
@@ -26217,7 +26216,7 @@ F: drivers/media/radio/radio-raremono.c
2621726216

2621826217
THERMAL
2621926218
M: Rafael J. Wysocki <rafael@kernel.org>
26220-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
26219+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
2622126220
R: Zhang Rui <rui.zhang@intel.com>
2622226221
R: Lukasz Luba <lukasz.luba@arm.com>
2622326222
L: linux-pm@vger.kernel.org
@@ -26247,7 +26246,7 @@ F: drivers/thermal/amlogic_thermal.c
2624726246

2624826247
THERMAL/CPU_COOLING
2624926248
M: Amit Daniel Kachhap <amit.kachhap@gmail.com>
26250-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
26249+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
2625126250
M: Viresh Kumar <viresh.kumar@linaro.org>
2625226251
R: Lukasz Luba <lukasz.luba@arm.com>
2625326252
L: linux-pm@vger.kernel.org
@@ -29186,7 +29185,7 @@ K: zstd
2918629185

2918729186
ZSWAP COMPRESSED SWAP CACHING
2918829187
M: Johannes Weiner <hannes@cmpxchg.org>
29189-
M: Yosry Ahmed <yosry.ahmed@linux.dev>
29188+
M: Yosry Ahmed <yosry@kernel.org>
2919029189
M: Nhat Pham <nphamcs@gmail.com>
2919129190
R: Chengming Zhou <chengming.zhou@linux.dev>
2919229191
L: linux-mm@kvack.org

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 7
33
PATCHLEVEL = 0
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

0 commit comments

Comments
 (0)