diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-02-15 16:57:32 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-02-15 16:57:37 +0100 |
commit | 471864ac8a3274106e0bf3a3e2119c282b76c062 (patch) | |
tree | 70a78630af16e5374ddfe9f5626750bf8bf60a7f /MAINTAINERS | |
parent | 8e8bc5000328a1ba8f93d43faf427e8ac31fb416 (diff) | |
parent | 41c25e193b2befc22462aa41591d397fab174ca1 (diff) | |
download | linux-stable-471864ac8a3274106e0bf3a3e2119c282b76c062.tar.gz linux-stable-471864ac8a3274106e0bf3a3e2119c282b76c062.tar.bz2 linux-stable-471864ac8a3274106e0bf3a3e2119c282b76c062.zip |
Merge branch 'for-linus' into for-next
Pull the latest 6.8 stuff into devel branch for further development.
Fixed the trivial merge conflict for HD-audio Realtek stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4faed8ffb38c..5f9b4fbcc32c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3168,10 +3168,10 @@ F: drivers/hwmon/asus-ec-sensors.c ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS M: Corentin Chary <corentin.chary@gmail.com> -L: acpi4asus-user@lists.sourceforge.net +M: Luke D. Jones <luke@ljones.dev> L: platform-driver-x86@vger.kernel.org S: Maintained -W: http://acpi4asus.sf.net +W: https://asus-linux.org/ F: drivers/platform/x86/asus*.c F: drivers/platform/x86/eeepc*.c @@ -4547,7 +4547,7 @@ F: drivers/net/ieee802154/ca8210.c CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS M: David Howells <dhowells@redhat.com> -L: linux-cachefs@redhat.com (moderated for non-subscribers) +L: netfs@lists.linux.dev S: Supported F: Documentation/filesystems/caching/cachefiles.rst F: fs/cachefiles/ @@ -5959,7 +5959,6 @@ S: Maintained F: drivers/platform/x86/dell/dell-wmi-descriptor.c DELL WMI HARDWARE PRIVACY SUPPORT -M: Perry Yuan <Perry.Yuan@dell.com> L: Dell.Client.Kernel@dell.com L: platform-driver-x86@vger.kernel.org S: Maintained @@ -7956,12 +7955,13 @@ L: rust-for-linux@vger.kernel.org S: Maintained F: rust/kernel/net/phy.rs -EXEC & BINFMT API +EXEC & BINFMT API, ELF R: Eric Biederman <ebiederm@xmission.com> R: Kees Cook <keescook@chromium.org> L: linux-mm@kvack.org S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve +F: Documentation/userspace-api/ELF.rst F: fs/*binfmt_*.c F: fs/exec.c F: include/linux/binfmts.h @@ -8224,7 +8224,8 @@ F: include/linux/iomap.h FILESYSTEMS [NETFS LIBRARY] M: David Howells <dhowells@redhat.com> -L: linux-cachefs@redhat.com (moderated for non-subscribers) +R: Jeff Layton <jlayton@kernel.org> +L: netfs@lists.linux.dev L: linux-fsdevel@vger.kernel.org S: Supported F: Documentation/filesystems/caching/ @@ -20556,6 +20557,7 @@ F: Documentation/translations/sp_SP/ SPARC + UltraSPARC (sparc/sparc64) M: "David S. Miller" <davem@davemloft.net> +M: Andreas Larsson <andreas@gaisler.com> L: sparclinux@vger.kernel.org S: Maintained Q: http://patchwork.ozlabs.org/project/sparclinux/list/ |