Skip to content

Commit af2d614

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.16-rc7). Conflicts: Documentation/netlink/specs/ovpn.yaml 880d43c ("netlink: specs: clean up spaces in brackets") af52020 ("ovpn: reject unexpected netlink attributes") drivers/net/phy/phy_device.c a44312d ("net: phy: Don't register LEDs for genphy") f0f2b99 ("net: phy: Don't register LEDs for genphy") https://lore.kernel.org/[email protected] drivers/net/wireless/intel/iwlwifi/fw/regulatory.c drivers/net/wireless/intel/iwlwifi/mld/regulatory.c 5fde0fc ("wifi: iwlwifi: mask reserved bits in chan_state_active_bitmap") ea045a0 ("wifi: iwlwifi: add support for accepting raw DSM tables by firmware") net/ipv6/mcast.c ae3264a ("ipv6: mcast: Delay put pmc->idev in mld_del_delrec()") a8594c9 ("ipv6: mcast: Avoid a duplicate pointer check in mld_del_delrec()") https://lore.kernel.org/[email protected] No adjacent changes. Signed-off-by: Jakub Kicinski <[email protected]>
2 parents a96cee9 + 6832a93 commit af2d614

File tree

241 files changed

+3064
-1158
lines changed

Some content is hidden

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

241 files changed

+3064
-1158
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ Kenneth W Chen <[email protected]>
416416
Kenneth Westfield <[email protected]> <[email protected]>
417417
Kiran Gunda <[email protected]> <[email protected]>
418418
Kirill Tkhai <[email protected]> <[email protected]>
419+
Kirill A. Shutemov <[email protected]> <[email protected]>
419420
Kishon Vijay Abraham I <[email protected]> <[email protected]>
420421
Konrad Dybcio <[email protected]> <[email protected]>
421422
Konrad Dybcio <[email protected]> <[email protected]>

‎Documentation/admin-guide/cgroup-v2.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,12 +1732,6 @@ The following nested keys are defined.
17321732
numa_hint_faults (npn)
17331733
Number of NUMA hinting faults.
17341734

1735-
numa_task_migrated (npn)
1736-
Number of task migration by NUMA balancing.
1737-
1738-
numa_task_swapped (npn)
1739-
Number of task swap by NUMA balancing.
1740-
17411735
pgdemote_kswapd
17421736
Number of pages demoted by kswapd.
17431737

‎Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ properties:
5252
'#clock-cells':
5353
const: 1
5454

55+
'#reset-cells':
56+
const: 1
57+
5558
required:
5659
- compatible
5760
- reg

‎Documentation/netlink/specs/ovpn.yaml

Lines changed: 147 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,66 @@ attribute-sets:
160160
name: link-tx-packets
161161
type: uint
162162
doc: Number of packets transmitted at the transport level
163+
-
164+
name: peer-new-input
165+
subset-of: peer
166+
attributes:
167+
-
168+
name: id
169+
-
170+
name: remote-ipv4
171+
-
172+
name: remote-ipv6
173+
-
174+
name: remote-ipv6-scope-id
175+
-
176+
name: remote-port
177+
-
178+
name: socket
179+
-
180+
name: vpn-ipv4
181+
-
182+
name: vpn-ipv6
183+
-
184+
name: local-ipv4
185+
-
186+
name: local-ipv6
187+
-
188+
name: keepalive-interval
189+
-
190+
name: keepalive-timeout
191+
-
192+
name: peer-set-input
193+
subset-of: peer
194+
attributes:
195+
-
196+
name: id
197+
-
198+
name: remote-ipv4
199+
-
200+
name: remote-ipv6
201+
-
202+
name: remote-ipv6-scope-id
203+
-
204+
name: remote-port
205+
-
206+
name: vpn-ipv4
207+
-
208+
name: vpn-ipv6
209+
-
210+
name: local-ipv4
211+
-
212+
name: local-ipv6
213+
-
214+
name: keepalive-interval
215+
-
216+
name: keepalive-timeout
217+
-
218+
name: peer-del-input
219+
subset-of: peer
220+
attributes:
221+
-
222+
name: id
163223
-
164224
name: keyconf
165225
attributes:
@@ -216,6 +276,33 @@ attribute-sets:
216276
obtain the actual cipher IV
217277
checks:
218278
exact-len: nonce-tail-size
279+
280+
-
281+
name: keyconf-get
282+
subset-of: keyconf
283+
attributes:
284+
-
285+
name: peer-id
286+
-
287+
name: slot
288+
-
289+
name: key-id
290+
-
291+
name: cipher-alg
292+
-
293+
name: keyconf-swap-input
294+
subset-of: keyconf
295+
attributes:
296+
-
297+
name: peer-id
298+
-
299+
name: keyconf-del-input
300+
subset-of: keyconf
301+
attributes:
302+
-
303+
name: peer-id
304+
-
305+
name: slot
219306
-
220307
name: ovpn
221308
attributes:
@@ -235,12 +322,66 @@ attribute-sets:
235322
type: nest
236323
doc: Peer specific cipher configuration
237324
nested-attributes: keyconf
325+
-
326+
name: ovpn-peer-new-input
327+
subset-of: ovpn
328+
attributes:
329+
-
330+
name: ifindex
331+
-
332+
name: peer
333+
nested-attributes: peer-new-input
334+
-
335+
name: ovpn-peer-set-input
336+
subset-of: ovpn
337+
attributes:
338+
-
339+
name: ifindex
340+
-
341+
name: peer
342+
nested-attributes: peer-set-input
343+
-
344+
name: ovpn-peer-del-input
345+
subset-of: ovpn
346+
attributes:
347+
-
348+
name: ifindex
349+
-
350+
name: peer
351+
nested-attributes: peer-del-input
352+
-
353+
name: ovpn-keyconf-get
354+
subset-of: ovpn
355+
attributes:
356+
-
357+
name: ifindex
358+
-
359+
name: keyconf
360+
nested-attributes: keyconf-get
361+
-
362+
name: ovpn-keyconf-swap-input
363+
subset-of: ovpn
364+
attributes:
365+
-
366+
name: ifindex
367+
-
368+
name: keyconf
369+
nested-attributes: keyconf-swap-input
370+
-
371+
name: ovpn-keyconf-del-input
372+
subset-of: ovpn
373+
attributes:
374+
-
375+
name: ifindex
376+
-
377+
name: keyconf
378+
nested-attributes: keyconf-del-input
238379

239380
operations:
240381
list:
241382
-
242383
name: peer-new
243-
attribute-set: ovpn
384+
attribute-set: ovpn-peer-new-input
244385
flags: [admin-perm]
245386
doc: Add a remote peer
246387
do:
@@ -252,7 +393,7 @@ operations:
252393
- peer
253394
-
254395
name: peer-set
255-
attribute-set: ovpn
396+
attribute-set: ovpn-peer-set-input
256397
flags: [admin-perm]
257398
doc: modify a remote peer
258399
do:
@@ -286,7 +427,7 @@ operations:
286427
- peer
287428
-
288429
name: peer-del
289-
attribute-set: ovpn
430+
attribute-set: ovpn-peer-del-input
290431
flags: [admin-perm]
291432
doc: Delete existing remote peer
292433
do:
@@ -316,7 +457,7 @@ operations:
316457
- keyconf
317458
-
318459
name: key-get
319-
attribute-set: ovpn
460+
attribute-set: ovpn-keyconf-get
320461
flags: [admin-perm]
321462
doc: Retrieve non-sensitive data about peer key and cipher
322463
do:
@@ -331,7 +472,7 @@ operations:
331472
- keyconf
332473
-
333474
name: key-swap
334-
attribute-set: ovpn
475+
attribute-set: ovpn-keyconf-swap-input
335476
flags: [admin-perm]
336477
doc: Swap primary and secondary session keys for a specific peer
337478
do:
@@ -350,7 +491,7 @@ operations:
350491
mcgrp: peers
351492
-
352493
name: key-del
353-
attribute-set: ovpn
494+
attribute-set: ovpn-keyconf-del-input
354495
flags: [admin-perm]
355496
doc: Delete cipher key for a specific peer
356497
do:

‎MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10519,7 +10519,7 @@ S: Maintained
1051910519
F: block/partitions/efi.*
1052010520

1052110521
HABANALABS PCI DRIVER
10522-
M: Ofir Bitton <[email protected]>
10522+
M: Yaron Avizrat <[email protected]>
1052310523
L: [email protected]
1052410524
S: Supported
1052510525
C: irc://irc.oftc.net/dri-devel
@@ -26961,7 +26961,7 @@ F: arch/x86/kernel/stacktrace.c
2696126961
F: arch/x86/kernel/unwind_*.c
2696226962

2696326963
X86 TRUST DOMAIN EXTENSIONS (TDX)
26964-
M: Kirill A. Shutemov <[email protected]>
26964+
M: Kirill A. Shutemov <[email protected]>
2696526965
R: Dave Hansen <[email protected]>
2696626966
L: [email protected]
2696726967
L: [email protected]

‎Makefile

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

88
# *DOCUMENTATION*

‎arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,12 @@
687687
};
688688

689689
wdog0: watchdog@2ad0000 {
690-
compatible = "fsl,imx21-wdt";
690+
compatible = "fsl,ls1046a-wdt", "fsl,imx21-wdt";
691691
reg = <0x0 0x2ad0000 0x0 0x10000>;
692692
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
693693
clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
694694
QORIQ_CLK_PLL_DIV(2)>;
695+
big-endian;
695696
};
696697

697698
edma0: dma-controller@2c00000 {

‎arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@
464464
};
465465

466466
reg_nvcc_sd: LDO5 {
467+
regulator-always-on;
467468
regulator-max-microvolt = <3300000>;
468469
regulator-min-microvolt = <1800000>;
469470
regulator-name = "On-module +V3.3_1.8_SD (LDO5)";

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
tpm@1 {
7171
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
7272
reg = <0x1>;
73-
spi-max-frequency = <36000000>;
73+
spi-max-frequency = <25000000>;
7474
};
7575
};
7676

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
tpm@1 {
111111
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
112112
reg = <0x1>;
113-
spi-max-frequency = <36000000>;
113+
spi-max-frequency = <25000000>;
114114
};
115115
};
116116

0 commit comments

Comments
 (0)