Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751157AbdFBDjd (ORCPT ); Thu, 1 Jun 2017 23:39:33 -0400 Received: from ozlabs.org ([103.22.144.67]:51371 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751120AbdFBDjb (ORCPT ); Thu, 1 Jun 2017 23:39:31 -0400 Date: Fri, 2 Jun 2017 13:39:28 +1000 From: Stephen Rothwell To: "Nicholas A. Bellinger" , Bart Van Assche Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: upcoming conflict between the target-updates and target-bva trees Message-ID: <20170602133928.2afa3e7a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 430 Lines: 13 Hi all, Last night the tagret-bva tree was rebased on top of the target-updates tree. Just now, part of the target-updates tree has been rewritten. So now I expect to get conflict(s) when I merge these trees since the commits in the target-updates tree are no longer the same as those that the target-bva tree was rebased on top of. Please take a little time to sort out your development process. -- Cheers, Stephen Rothwell