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

From: Luis Chamberlain
Date: Tue Feb 22 2022 - 19:06:50 EST


On Tue, Feb 22, 2022 at 11:52:18PM +0000, broonie@xxxxxxxxxx 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