lkml.org 
[lkml]   [2022]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the sysctl tree with the tip tree
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

\
 
 \ /
  Last update: 2022-03-16 00:04    [W:0.034 / U:0.584 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site