Le 18/05/2020 14:22, Jonathan Corbet a écrit :
On Mon, 18 May 2020 12:30:13 +1000
Stephen Rothwell wrote:
Today's linux-next merge of the jc_docs tree got a conflict in:
kernel/sysctl.c
between commit:
f461d2dcd511 ("sysctl: avoid forward declarations")
from the vfs tree and commit:
On Mon, 18 May 2020 12:30:13 +1000
Stephen Rothwell wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> kernel/sysctl.c
>
> between commit:
>
> f461d2dcd511 ("sysctl: avoid forward declarations")
>
> from the vfs tree and commit:
>
> 2f4c33063ad7 ("docs: sysctl
Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
kernel/sysctl.c
between commit:
f461d2dcd511 ("sysctl: avoid forward declarations")
from the vfs tree and commit:
2f4c33063ad7 ("docs: sysctl/kernel: document ngroups_max")
from the jc_docs tree.
I fixed it up (se
