linux-kernel - Re: linux-next: manual merge of the csky tree with the mm 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]

Date:   Tue, 15 Aug 2023 04:18:13 +0100
From:   Matthew Wilcox <willy@...radead.org>
To:     Guo Ren <guoren@...nel.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Guo Ren <guoren@...ux.alibaba.com>,
        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>
Subject: Re: linux-next: manual merge of the csky tree with the mm tree

On Tue, Aug 15, 2023 at 11:11:52AM +0800, Guo Ren wrote:
> On Tue, Aug 15, 2023 at 8:46 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the csky tree got a conflict in:
> >
> >   arch/csky/abiv2/cacheflush.c
> >
> > between commit:
> >
> >   1222e1310d64 ("csky: implement the new page table range API")
> Could I take this patch into csky next tree to solve the conflict.

No.  It depends on the predecessor patches in that series.