From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=b8Av=W5=vger.kernel.org=linux-next-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=-2.2 required=3.0 tests=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 1690EC3A59E
	for <linux-next@archiver.kernel.org>; Mon,  2 Sep 2019 11:52:56 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id E9A9F217F4
	for <linux-next@archiver.kernel.org>; Mon,  2 Sep 2019 11:52:55 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1731216AbfIBLws (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Mon, 2 Sep 2019 07:52:48 -0400
Received: from verein.lst.de ([213.95.11.211]:49614 "EHLO verein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1729918AbfIBLwr (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Mon, 2 Sep 2019 07:52:47 -0400
Received: by verein.lst.de (Postfix, from userid 2407)
        id 8704768AFE; Mon,  2 Sep 2019 13:52:43 +0200 (CEST)
Date:   Mon, 2 Sep 2019 13:52:43 +0200
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Michael Ellerman <mpe@ellerman.id.au>,
        PowerPC <linuxppc-dev@lists.ozlabs.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>, Michal Simek <monstr@monstr.eu>
Subject: Re: linux-next: build failure after merge of the powerpc tree
Message-ID: <20190902115243.GA1011@lst.de>
References: <20190902214011.2a5400c9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190902214011.2a5400c9@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Mon, Sep 02, 2019 at 09:40:11PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the powerpc tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:

Yes, this conflict is expected and we dicussed it before.  I'll make
sure Linus is in the loop when sending the pull request.