Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sun, 5 Jan 2020 17:50:35 -0800 (PST)
From:   Paul Walmsley <paul.walmsley@sifive.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
cc:     Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul@pwsan.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 risc-v tree with Linus' tree
In-Reply-To: <20200106093246.6abbb7e9@canb.auug.org.au>
Message-ID: <alpine.DEB.2.21.9999.2001051749560.484919@viisi.sifive.com>
References: <20200106093246.6abbb7e9@canb.auug.org.au>
User-Agent: Alpine 2.21.9999 (DEB 301 2018-08-15)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Stephen,

On Mon, 6 Jan 2020, Stephen Rothwell wrote:

> Today's linux-next merge of the risc-v tree got a conflict in:
> 
>   Documentation/riscv/patch-acceptance.rst
> 
> between commit:
> 
>   0e194d9da198 ("Documentation: riscv: add patch acceptance guidelines")
> 
> from Linus' tree and commit:
> 
>   d89a1a16d7dc ("Documentation: riscv: add patch acceptance guidelines")
> 
> from the risc-v tree.
> 
> I fixed it up (I used the version from Linus' tree as that was committed
> later) and can carry the fix as necessary. This is now fixed as far as
> linux-next is concerned, but any non trivial conflicts should be mentioned
> to your upstream maintainer when your tree is submitted for merging.
> You may also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.

Thanks, I just reset our for-next branch to v5.5-rc5, so this won't 
reappear.

- Paul