Commit 4906f39a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6.7-rc4 into char-misc-linus 



We need 6.7-rc4 in here as we need to revert one of the debugfs changes
that came in that release through the wireless tree.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents af54d778 33cc938e

Documentation/ABI/testing/sysfs-class-led

+0 −9
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ Description: 
		brightness. Reading this file when no hw brightness change

		event has happened will return an ENODATA error.



What:		/sys/class/leds/<led>/color

Date:		June 2023

KernelVersion:	6.5

Description:

		Color of the LED.



		This is a read-only file. Reading this file returns the color

		of the LED as a string (e.g: "red", "green", "multicolor").



What:		/sys/class/leds/<led>/trigger

Date:		March 2006

KernelVersion:	2.6.17

Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ title: NXP S32G2 pin controller 


maintainers:

  - Ghennadi Procopciuc <Ghennadi.Procopciuc@oss.nxp.com>

  - Chester Lin <clin@suse.com>

  - Chester Lin <chester62515@gmail.com>



description: |

  S32G2 pinmux is implemented in SIUL2 (System Integration Unit Lite2),

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -5076,7 +5076,6 @@ CLANG CONTROL FLOW INTEGRITY SUPPORT 
M:	Sami Tolvanen <samitolvanen@google.com>

M:	Kees Cook <keescook@chromium.org>

R:	Nathan Chancellor <nathan@kernel.org>

R:	Nick Desaulniers <ndesaulniers@google.com>

L:	llvm@lists.linux.dev

S:	Supported

B:	https://github.com/ClangBuiltLinux/linux/issues
@@ -5091,8 +5090,9 @@ F: .clang-format 








CLANG/LLVM BUILD SUPPORT









M:	Nathan Chancellor <nathan@kernel.org>









M:	Nick Desaulniers <ndesaulniers@google.com>









R:	Tom Rix <trix@redhat.com>









R:	Nick Desaulniers <ndesaulniers@google.com>









R:	Bill Wendling <morbo@google.com>









R:	Justin Stitt <justinstitt@google.com>









L:	llvm@lists.linux.dev









S:	Supported









W:	https://clangbuiltlinux.github.io/








@@ -5242,7 +5242,6 @@ F:	drivers/platform/x86/compal-laptop.c















COMPILER ATTRIBUTES









M:	Miguel Ojeda <ojeda@kernel.org>









R:	Nick Desaulniers <ndesaulniers@google.com>









S:	Maintained









F:	include/linux/compiler_attributes.h
















@@ -11516,7 +11515,6 @@ F:	fs/autofs/







KERNEL BUILD + files below scripts/ (unless maintained elsewhere)









M:	Masahiro Yamada <masahiroy@kernel.org>









R:	Nathan Chancellor <nathan@kernel.org>









R:	Nick Desaulniers <ndesaulniers@google.com>









R:	Nicolas Schier <nicolas@fjasle.eu>









L:	linux-kbuild@vger.kernel.org









S:	Maintained








@@ -17948,6 +17946,8 @@ L:	iommu@lists.linux.dev







L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	drivers/iommu/arm/arm-smmu/qcom_iommu.c









F:	drivers/iommu/arm/arm-smmu/arm-smmu-qcom*









F:	drivers/iommu/msm_iommu*

















QUALCOMM IPC ROUTER (QRTR) DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 7









SUBLEVEL = 0









EXTRAVERSION = -rc3









EXTRAVERSION = -rc4









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*
































arch/arm64/kernel/cpufeature.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -1839,6 +1839,10 @@ static int __init __kpti_install_ng_mappings(void *__unused)

















static void __init kpti_install_ng_mappings(void)









{









	/* Check whether KPTI is going to be used */









	if (!cpus_have_cap(ARM64_UNMAP_KERNEL_AT_EL0))









		return;



















	/*









	 * We don't need to rewrite the page-tables if either we've done









	 * it already or we have KASLR enabled and therefore have not