From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=9e++=CZ=vger.kernel.org=linux-kernel-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,
	USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 62117C2D0E3
	for <linux-kernel@archiver.kernel.org>; Wed, 16 Sep 2020 04:35:32 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 2C6422076C
	for <linux-kernel@archiver.kernel.org>; Wed, 16 Sep 2020 04:35:32 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726234AbgIPEfb (ORCPT
        <rfc822;linux-kernel@archiver.kernel.org>);
        Wed, 16 Sep 2020 00:35:31 -0400
Received: from verein.lst.de ([213.95.11.211]:50622 "EHLO verein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726125AbgIPEf3 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 16 Sep 2020 00:35:29 -0400
Received: by verein.lst.de (Postfix, from userid 2407)
        id 9D75768BFE; Wed, 16 Sep 2020 06:35:25 +0200 (CEST)
Date:   Wed, 16 Sep 2020 06:35:24 +0200
From:   Christoph Hellwig <hch@lst.de>
To:     "Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Andrew Morton <akpm@linux-foundation.org>,
        Christoph Hellwig <hch@lst.de>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 dma-mapping tree
Message-ID: <20200916043524.GA6412@lst.de>
References: <20200916141130.398aa2a8@canb.auug.org.au> <a76cbfaaeeb14c4ca8b3f6a154fe0fa3@hisilicon.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <a76cbfaaeeb14c4ca8b3f6a154fe0fa3@hisilicon.com>
User-Agent: Mutt/1.5.17 (2007-11-01)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.