Skip to content

Commit 412751a

Browse files
author
Ingo Molnar
committed
Merge tag 'v6.15-rc7' into x86/core, to pick up fixes
Pick up build fixes from upstream to make this tree more testable. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents e95534e + a5806cd commit 412751a

File tree

302 files changed

+3046
-1383
lines changed

Some content is hidden

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

302 files changed

+3046
-1383
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
102102
Arnaud Patard <arnaud.patard@rtp-net.org>
103103
Arnd Bergmann <arnd@arndb.de>
104104
Arun Kumar Neelakantam <quic_aneela@quicinc.com> <aneela@codeaurora.org>
105+
Asahi Lina <lina+kernel@asahilina.net> <lina@asahilina.net>
105106
Ashok Raj Nagarajan <quic_arnagara@quicinc.com> <arnagara@codeaurora.org>
106107
Ashwin Chaugule <quic_ashwinc@quicinc.com> <ashwinc@codeaurora.org>
107108
Asutosh Das <quic_asutoshd@quicinc.com> <asutoshd@codeaurora.org>

‎Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/bus/hid/drivers/hid-appletb-kbd/<dev>/mode
2-
Date: September, 2023
3-
KernelVersion: 6.5
2+
Date: March, 2025
3+
KernelVersion: 6.15
44
Contact: linux-input@vger.kernel.org
55
Description:
66
The set of keys displayed on the Touch Bar.

‎Documentation/kbuild/reproducible-builds.rst

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,21 @@ The kernel embeds the building user and host names in
4646
`KBUILD_BUILD_USER and KBUILD_BUILD_HOST`_ variables. If you are
4747
building from a git commit, you could use its committer address.
4848

49+
Absolute filenames
50+
------------------
51+
52+
When the kernel is built out-of-tree, debug information may include
53+
absolute filenames for the source files. This must be overridden by
54+
including the ``-fdebug-prefix-map`` option in the `KCFLAGS`_ variable.
55+
56+
Depending on the compiler used, the ``__FILE__`` macro may also expand
57+
to an absolute filename in an out-of-tree build. Kbuild automatically
58+
uses the ``-fmacro-prefix-map`` option to prevent this, if it is
59+
supported.
60+
61+
The Reproducible Builds web site has more information about these
62+
`prefix-map options`_.
63+
4964
Generated files in source packages
5065
----------------------------------
5166

@@ -116,5 +131,7 @@ See ``scripts/setlocalversion`` for details.
116131

117132
.. _KBUILD_BUILD_TIMESTAMP: kbuild.html#kbuild-build-timestamp
118133
.. _KBUILD_BUILD_USER and KBUILD_BUILD_HOST: kbuild.html#kbuild-build-user-kbuild-build-host
134+
.. _KCFLAGS: kbuild.html#kcflags
135+
.. _prefix-map options: https://reproducible-builds.org/docs/build-path/
119136
.. _Reproducible Builds project: https://reproducible-builds.org/
120137
.. _SOURCE_DATE_EPOCH: https://reproducible-builds.org/docs/source-date-epoch/

‎Documentation/netlink/specs/tc.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,8 @@ attribute-sets:
20172017
attributes:
20182018
-
20192019
name: act
2020-
type: nest
2020+
type: indexed-array
2021+
sub-type: nest
20212022
nested-attributes: tc-act-attrs
20222023
-
20232024
name: police
@@ -2250,7 +2251,8 @@ attribute-sets:
22502251
attributes:
22512252
-
22522253
name: act
2253-
type: nest
2254+
type: indexed-array
2255+
sub-type: nest
22542256
nested-attributes: tc-act-attrs
22552257
-
22562258
name: police
@@ -2745,7 +2747,7 @@ attribute-sets:
27452747
type: u16
27462748
byte-order: big-endian
27472749
-
2748-
name: key-l2-tpv3-sid
2750+
name: key-l2tpv3-sid
27492751
type: u32
27502752
byte-order: big-endian
27512753
-
@@ -3504,7 +3506,7 @@ attribute-sets:
35043506
name: rate64
35053507
type: u64
35063508
-
3507-
name: prate4
3509+
name: prate64
35083510
type: u64
35093511
-
35103512
name: burst

‎Documentation/networking/timestamping.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -811,11 +811,9 @@ Documentation/devicetree/bindings/ptp/timestamper.txt for more details.
811811
3.2.4 Other caveats for MAC drivers
812812
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
813813

814-
Stacked PHCs, especially DSA (but not only) - since that doesn't require any
815-
modification to MAC drivers, so it is more difficult to ensure correctness of
816-
all possible code paths - is that they uncover bugs which were impossible to
817-
trigger before the existence of stacked PTP clocks. One example has to do with
818-
this line of code, already presented earlier::
814+
The use of stacked PHCs may uncover MAC driver bugs which were impossible to
815+
trigger without them. One example has to do with this line of code, already
816+
presented earlier::
819817

820818
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
821819

‎MAINTAINERS

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10147,6 +10147,13 @@ F: drivers/gpio/gpio-regmap.c
1014710147
F: include/linux/gpio/regmap.h
1014810148
K: (devm_)?gpio_regmap_(un)?register
1014910149

10150+
GPIO SLOPPY LOGIC ANALYZER
10151+
M: Wolfram Sang <wsa+renesas@sang-engineering.com>
10152+
S: Supported
10153+
F: Documentation/dev-tools/gpio-sloppy-logic-analyzer.rst
10154+
F: drivers/gpio/gpio-sloppy-logic-analyzer.c
10155+
F: tools/gpio/gpio-sloppy-logic-analyzer.sh
10156+
1015010157
GPIO SUBSYSTEM
1015110158
M: Linus Walleij <linus.walleij@linaro.org>
1015210159
M: Bartosz Golaszewski <brgl@bgdev.pl>
@@ -15542,6 +15549,18 @@ S: Maintained
1554215549
F: include/linux/execmem.h
1554315550
F: mm/execmem.c
1554415551

15552+
MEMORY MANAGEMENT - GUP (GET USER PAGES)
15553+
M: Andrew Morton <akpm@linux-foundation.org>
15554+
M: David Hildenbrand <david@redhat.com>
15555+
R: Jason Gunthorpe <jgg@nvidia.com>
15556+
R: John Hubbard <jhubbard@nvidia.com>
15557+
R: Peter Xu <peterx@redhat.com>
15558+
L: linux-mm@kvack.org
15559+
S: Maintained
15560+
W: http://www.linux-mm.org
15561+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
15562+
F: mm/gup.c
15563+
1554515564
MEMORY MANAGEMENT - NUMA MEMBLOCKS AND NUMA EMULATION
1554615565
M: Andrew Morton <akpm@linux-foundation.org>
1554715566
M: Mike Rapoport <rppt@kernel.org>
@@ -18432,7 +18451,7 @@ F: include/uapi/linux/ppdev.h
1843218451
PARAVIRT_OPS INTERFACE
1843318452
M: Juergen Gross <jgross@suse.com>
1843418453
R: Ajay Kaher <ajay.kaher@broadcom.com>
18435-
R: Alexey Makhalov <alexey.amakhalov@broadcom.com>
18454+
R: Alexey Makhalov <alexey.makhalov@broadcom.com>
1843618455
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
1843718456
L: virtualization@lists.linux.dev
1843818457
L: x86@kernel.org
@@ -22916,7 +22935,6 @@ F: drivers/accessibility/speakup/
2291622935

2291722936
SPEAR PLATFORM/CLOCK/PINCTRL SUPPORT
2291822937
M: Viresh Kumar <vireshk@kernel.org>
22919-
M: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
2292022938
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2292122939
L: soc@lists.linux.dev
2292222940
S: Maintained
@@ -25918,7 +25936,7 @@ F: drivers/misc/vmw_balloon.c
2591825936

2591925937
VMWARE HYPERVISOR INTERFACE
2592025938
M: Ajay Kaher <ajay.kaher@broadcom.com>
25921-
M: Alexey Makhalov <alexey.amakhalov@broadcom.com>
25939+
M: Alexey Makhalov <alexey.makhalov@broadcom.com>
2592225940
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
2592325941
L: virtualization@lists.linux.dev
2592425942
L: x86@kernel.org
@@ -25946,7 +25964,7 @@ F: drivers/scsi/vmw_pvscsi.h
2594625964
VMWARE VIRTUAL PTP CLOCK DRIVER
2594725965
M: Nick Shi <nick.shi@broadcom.com>
2594825966
R: Ajay Kaher <ajay.kaher@broadcom.com>
25949-
R: Alexey Makhalov <alexey.amakhalov@broadcom.com>
25967+
R: Alexey Makhalov <alexey.makhalov@broadcom.com>
2595025968
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
2595125969
L: netdev@vger.kernel.org
2595225970
S: Supported

‎Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 15
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc6
5+
EXTRAVERSION = -rc7
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*
@@ -1068,8 +1068,7 @@ KBUILD_CFLAGS += -fno-builtin-wcslen
10681068

10691069
# change __FILE__ to the relative path to the source directory
10701070
ifdef building_out_of_srctree
1071-
KBUILD_CPPFLAGS += $(call cc-option,-ffile-prefix-map=$(srcroot)/=)
1072-
KBUILD_RUSTFLAGS += --remap-path-prefix=$(srcroot)/=
1071+
KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srcroot)/=)
10731072
endif
10741073

10751074
# include additional Makefiles when needed

‎arch/arm/boot/dts/amlogic/meson8.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
pwm_ef: pwm@86c0 {
452452
compatible = "amlogic,meson8-pwm-v2";
453453
clocks = <&xtal>,
454-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
454+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
455455
<&clkc CLKID_FCLK_DIV4>,
456456
<&clkc CLKID_FCLK_DIV3>;
457457
reg = <0x86c0 0x10>;
@@ -705,15 +705,15 @@
705705
&pwm_ab {
706706
compatible = "amlogic,meson8-pwm-v2";
707707
clocks = <&xtal>,
708-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
708+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
709709
<&clkc CLKID_FCLK_DIV4>,
710710
<&clkc CLKID_FCLK_DIV3>;
711711
};
712712

713713
&pwm_cd {
714714
compatible = "amlogic,meson8-pwm-v2";
715715
clocks = <&xtal>,
716-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
716+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
717717
<&clkc CLKID_FCLK_DIV4>,
718718
<&clkc CLKID_FCLK_DIV3>;
719719
};

‎arch/arm/boot/dts/amlogic/meson8b.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
407407
reg = <0x86c0 0x10>;
408408
clocks = <&xtal>,
409-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
409+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
410410
<&clkc CLKID_FCLK_DIV4>,
411411
<&clkc CLKID_FCLK_DIV3>;
412412
#pwm-cells = <3>;
@@ -680,15 +680,15 @@
680680
&pwm_ab {
681681
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
682682
clocks = <&xtal>,
683-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
683+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
684684
<&clkc CLKID_FCLK_DIV4>,
685685
<&clkc CLKID_FCLK_DIV3>;
686686
};
687687

688688
&pwm_cd {
689689
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
690690
clocks = <&xtal>,
691-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
691+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
692692
<&clkc CLKID_FCLK_DIV4>,
693693
<&clkc CLKID_FCLK_DIV3>;
694694
};

‎arch/arm64/boot/dts/amazon/alpine-v2.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
al,msi-num-spis = <160>;
152152
};
153153

154-
io-fabric@fc000000 {
154+
io-bus@fc000000 {
155155
compatible = "simple-bus";
156156
#address-cells = <1>;
157157
#size-cells = <1>;

0 commit comments

Comments
 (0)