From: Luis Chamberlain <mcgrof@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Zhen Ni <nizhen@uniontech.com>
Subject: Re: linux-next: manual merge of the sysctl tree with the tip tree
Date: Tue, 15 Mar 2022 16:02:26 -0700 [thread overview]
Message-ID: <YjEbAo2126TjKNeE@bombadil.infradead.org> (raw)
In-Reply-To: <20220316080215.46eb8cd5@canb.auug.org.au>
On Wed, Mar 16, 2022 at 08:02:15AM +1100, Stephen Rothwell wrote:
> Hi Luis,
>
> On Tue, 15 Mar 2022 13:17:43 -0700 Luis Chamberlain <mcgrof@kernel.org> wrote:
> >
> > On Tue, Mar 15, 2022 at 08:18:40PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the sysctl tree got a conflict in:
> > >
> > > kernel/sched/deadline.c
> > >
> > > between commit:
> > >
> > > eb77cf1c151c ("sched/deadline: Remove unused def_dl_bandwidth")
> > >
> > > from the tip tree and commit:
> > >
> > > ebb891f03580 ("sched: Move deadline_period sysctls to deadline.c")
> > >
> > > from the sysctl tree.
> >
> > Peter,
> >
> > to help avoid conflicts I spinned up a sysctl-next tree to collect
> > different cleanups going on kernel/sysctl.c. I can drop
> > ebb891f03580 ("sched: Move deadline_period sysctls to deadline.c")
> > but I think we'd still run into conflicts as other sysctls are
> > trimmed out. Would you be OK in me taking in eb77cf1c151c
> > ("sched/deadline: Remove unused def_dl_bandwidth") to avoid this
> > conflict?
>
> Its really a trivial conflict and just needs to be mentioned to Linus
> in the pull requests.
Ah alrighty! Thanks!
Luis
next prev parent reply other threads:[~2022-03-15 23:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 9:18 linux-next: manual merge of the sysctl tree with the tip tree Stephen Rothwell
2022-03-15 20:17 ` Luis Chamberlain
2022-03-15 21:02 ` Stephen Rothwell
2022-03-15 23:02 ` Luis Chamberlain [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-24 6:03 Stephen Rothwell
2025-02-27 12:18 ` Joel Granados
2022-02-22 23:52 broonie
2022-02-23 0:06 ` Luis Chamberlain
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=YjEbAo2126TjKNeE@bombadil.infradead.org \
--to=mcgrof@kernel.org \
--cc=dietmar.eggemann@arm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nizhen@uniontech.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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