From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Luis Chamberlain <mcgrof@kernel.org>, Kees Cook <kees@kernel.org>,
Joel Granados <joel.granados@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Oleg Nesterov <oleg@redhat.com>
Subject: Re: linux-next: manual merge of the sysctl tree with the mm-nonmm-unstable tree
Date: Tue, 28 Jul 2026 13:47:55 -0700 [thread overview]
Message-ID: <20260728134755.501c6ac650c7a3868ae00614@linux-foundation.org> (raw)
In-Reply-To: <amjpZ1aYsps44ExZ@sirena.org.uk>
On Tue, 28 Jul 2026 18:39:51 +0100 Mark Brown <broonie@kernel.org> wrote:
> Today's linux-next merge of the sysctl tree got a conflict in:
>
> kernel/time/jiffies.c
>
> between commit:
>
> 842912dea6d51 ("sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL")
>
> from the mm-nonmm-unstable tree and commit:
>
> a3c70a5a9f944 ("sysctl: Generate do_proc_doulongvec_minmax with do_proc_dotypevec macro")
>
> from the sysctl tree.
Luis, can you please grab both
sysctl: move the "cad_pid" entry from pid_table[] to kern_reboot_table[]
https://lore.kernel.org/al4C572uhLdBvyzH@redhat.com
and
sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL
https://lore.kernel.org/amdveg1m4E4uQlGv@redhat.com
I'll email them at you...
next prev parent reply other threads:[~2026-07-28 20:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-28 17:39 linux-next: manual merge of the sysctl tree with the mm-nonmm-unstable tree Mark Brown
2026-07-28 20:47 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-08 9:00 Stephen Rothwell
2025-07-22 9:58 ` Joel Granados
2025-07-22 23:10 ` Stephen Rothwell
2025-07-31 1:05 ` Stephen Rothwell
2025-08-04 7:53 ` Joel Granados
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260728134755.501c6ac650c7a3868ae00614@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=joel.granados@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=oleg@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox