diff options
| author | Linus Torvalds | 2024-09-24 11:08:40 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2024-09-24 11:08:40 -0700 |
| commit | 172d513936c707e991c3eca1b79cd8a153171862 (patch) | |
| tree | 4fb4d95f7d389ba3ab80008342d351e2ca761a17 /MAINTAINERS | |
| parent | 97d8894b6f4c44762fd48f5d29e73358d6181dbb (diff) | |
| parent | 732b47db1d6c26985faca1ae5820bcfa10f6335d (diff) | |
Merge tag 'sysctl-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl
Pull sysctl update from Joel Granados:
- Avoid evaluating non-mount ctl_tables as a sysctl_mount_point by
removing the unlikely (but possible) chance that the permanently
empty ctl_table array shares its address with another ctl_table
- Update Joel Granados' contact info in MAINTAINERS
* tag 'sysctl-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
MAINTAINERS: update email for Joel Granados
sysctl: avoid spurious permanent empty tables
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 37ecb75f5890..42bb30fdc244 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18507,7 +18507,7 @@ F: tools/testing/selftests/proc/ PROC SYSCTL M: Luis Chamberlain <mcgrof@kernel.org> M: Kees Cook <kees@kernel.org> -M: Joel Granados <j.granados@samsung.com> +M: Joel Granados <joel.granados@kernel.org> L: linux-kernel@vger.kernel.org L: linux-fsdevel@vger.kernel.org S: Maintained |