Merge tag 'v6.15-rc7' into x86/core, to pick up fixes (412751aa) · Commits · git / linux-net

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
		Arnaud Patard <arnaud.patard@rtp-net.org>
		Arnd Bergmann <arnd@arndb.de>
		Arun Kumar Neelakantam <quic_aneela@quicinc.com> <aneela@codeaurora.org>
		Asahi Lina <lina+kernel@asahilina.net> <lina@asahilina.net>
		Ashok Raj Nagarajan <quic_arnagara@quicinc.com> <arnagara@codeaurora.org>
		Ashwin Chaugule <quic_ashwinc@quicinc.com> <ashwinc@codeaurora.org>
		Asutosh Das <quic_asutoshd@quicinc.com> <asutoshd@codeaurora.org>

+2 −2

Original line number	Diff line number	Diff line
		What: /sys/bus/hid/drivers/hid-appletb-kbd/<dev>/mode
		Date: September, 2023
		KernelVersion: 6.5
		Date: March, 2025
		KernelVersion: 6.15
		Contact: linux-input@vger.kernel.org
		Description:
		The set of keys displayed on the Touch Bar.

+17 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,21 @@ The kernel embeds the building user and host names in
		`KBUILD_BUILD_USER and KBUILD_BUILD_HOST`_ variables. If you are
		building from a git commit, you could use its committer address.

		Absolute filenames
		------------------

		When the kernel is built out-of-tree, debug information may include
		absolute filenames for the source files. This must be overridden by
		including the ``-fdebug-prefix-map`` option in the `KCFLAGS`_ variable.

		Depending on the compiler used, the ``__FILE__`` macro may also expand
		to an absolute filename in an out-of-tree build. Kbuild automatically
		uses the ``-fmacro-prefix-map`` option to prevent this, if it is
		supported.

		The Reproducible Builds web site has more information about these
		`prefix-map options`_.

		Generated files in source packages
		----------------------------------

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

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -2017,7 +2017,8 @@ attribute-sets:
		attributes:
		-
		name: act
		type: nest
		type: indexed-array
		sub-type: nest
		nested-attributes: tc-act-attrs
		-
		name: police
		@@ -2250,7 +2251,8 @@ attribute-sets:
		attributes:
		-
		name: act
		type: nest
		type: indexed-array
		sub-type: nest
		nested-attributes: tc-act-attrs
		-
		name: police
		@@ -2745,7 +2747,7 @@ attribute-sets:
		type: u16
		byte-order: big-endian
		-
		name: key-l2-tpv3-sid
		name: key-l2tpv3-sid
		type: u32
		byte-order: big-endian
		-
		@@ -3504,7 +3506,7 @@ attribute-sets:
		name: rate64
		type: u64
		-
		name: prate4
		name: prate64
		type: u64
		-
		name: burst

+3 −5

Original line number	Diff line number	Diff line
		@@ -811,11 +811,9 @@ Documentation/devicetree/bindings/ptp/timestamper.txt for more details.
		3.2.4 Other caveats for MAC drivers
		^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

		skb_shinfo(skb)->tx_flags \|= SKBTX_IN_PROGRESS;