From: Luis Chamberlain <mcgrof@kernel.org>
To: broonie@kernel.org, Peter Zijlstra <peterz@infradead.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
sujiaxun <sujiaxun@uniontech.com>,
tangmeng <tangmeng@uniontech.com>,
zhanglianjie <zhanglianjie@uniontech.com>,
Zhen Ni <nizhen@uniontech.com>
Subject: Re: linux-next: manual merge of the sysctl tree with the tip tree
Date: Tue, 22 Feb 2022 16:06:28 -0800 [thread overview]
Message-ID: <YhV6hKamk3DRILPu@bombadil.infradead.org> (raw)
In-Reply-To: <20220222235218.906101-1-broonie@kernel.org>
On Tue, Feb 22, 2022 at 11:52:18PM +0000, broonie@kernel.org wrote:
> Hi all,
>
> Today's linux-next merge of the sysctl tree got conflicts in:
>
> include/linux/sched/sysctl.h
> kernel/sysctl.c
>
> between commit:
>
> c8eaf6ac76f40 ("sched: move autogroup sysctls into its own file")
Peter, would you prefer if I just take this one commit? The syctl
changes keep coming. Let me know!
Luis
next prev parent reply other threads:[~2022-02-23 0:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 23:52 linux-next: manual merge of the sysctl tree with the tip tree broonie
2022-02-23 0:06 ` Luis Chamberlain [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 9:18 Stephen Rothwell
2022-03-15 20:17 ` Luis Chamberlain
2022-03-15 21:02 ` Stephen Rothwell
2022-03-15 23:02 ` Luis Chamberlain
2025-02-24 6:03 Stephen Rothwell
2025-02-27 12:18 ` 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=YhV6hKamk3DRILPu@bombadil.infradead.org \
--to=mcgrof@kernel.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nizhen@uniontech.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=sujiaxun@uniontech.com \
--cc=tangmeng@uniontech.com \
--cc=zhanglianjie@uniontech.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