Re: linux-next: manual merge of the sysctl tree with the tip tree

[Luis Chamberlain]

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?

  Luis