Messages in this thread | | | Date | Tue, 22 Feb 2022 16:06:28 -0800 | From | Luis Chamberlain <> | Subject | Re: linux-next: manual merge of the sysctl tree with the tip tree |
| |
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
| |