linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the dma-mapping 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: <20200916043524.GA6412@lst.de>
Date:   Wed, 16 Sep 2020 06:35:24 +0200
From:   Christoph Hellwig <hch@....de>
To:     "Song Bao Hua (Barry Song)" <song.bao.hua@...ilicon.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Christoph Hellwig <hch@....de>,
        Mike Kravetz <mike.kravetz@...cle.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 dma-mapping tree

On Wed, Sep 16, 2020 at 04:22:03AM +0000, Song Bao Hua (Barry Song) wrote:
> >   c999bd436fe9 ("mm/cma: make number of CMA areas dynamic, remove
> > CONFIG_CMA_AREAS")
> > 
> > from the akpm-current tree.
> 
> I guess this is because Mike's patch was written on top of dma-mapping's next branch.

It wasn't.

> Will it be better to go through Christoph's tree?

I don't think this merge is much of a problem, we'll just need to tell
Linus about it.