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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <YhV6hKamk3DRILPu@bombadil.infradead.org>
Date:   Tue, 22 Feb 2022 16:06:28 -0800
From:   Luis Chamberlain <mcgrof@...nel.org>
To:     broonie@...nel.org, Peter Zijlstra <peterz@...radead.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        sujiaxun <sujiaxun@...ontech.com>,
        tangmeng <tangmeng@...ontech.com>,
        zhanglianjie <zhanglianjie@...ontech.com>,
        Zhen Ni <nizhen@...ontech.com>
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@...nel.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