linux-next: upcoming conflict between the target-updates and target-bva trees

Path	csiph.com!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: upcoming conflict between the target-updates and target-bva trees
Date	Fri, 02 Jun 2017 05:40:01 +0200
Message-ID	<tNLBn-3BC-5@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1496374769; bh=H2tdxXFhtzFF2/Wisv20f9Eff0FtMS3iVpUVmW/IX0s=; h=Date:From:To:Cc:Subject:From; b=T3o3zK73cwvB/X09+E1LCRts4ql/VmbXxaR21TQquGD0HVBeDYvAyq0GL+hy4utye N3rX4CnsMqQ7u8NKnKbsz+LoZJaTN7ueI1YM1og/sBcW6sVBr/2A7bEiwKKrZFMlPd +cA80rUEEzFoqCyE8F6khSE/xCaudQoYMyHwde/t1WWc+dnVdxBMepiScAWx3n44SB J9FNMNrmPRhmEhF+NiVAfvN5tElTnVe/l0cSZuZwVzVy7On73sWURDngWqDCxwNQ0z bQYrrHVaZv9TY0Cq8L/DH9kcXRf1fSPkAap7r15WSgXn7eEYbceKRoB3PKkjV8aNqe ya3yKVXLyFE6Q==
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	13
Organization	linux.* mail to news gateway
X-Original-Cc	Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
X-Original-Date	Fri, 2 Jun 2017 13:39:28 +1000
X-Original-Message-ID	<20170602133928.2afa3e7a@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1655880

Show key headers only | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: upcoming conflict between the target-updates and  target-bva trees Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-02 05:40 +0200
  Re: linux-next: upcoming conflict between the target-updates and  target-bva trees "Nicholas A. Bellinger" <nab@linux-iscsi.org> - 2017-06-02 06:10 +0200
    Re: linux-next: upcoming conflict between the target-updates and         target-bva trees Bart Van Assche <bvanassche@acm.org> - 2017-06-02 07:20 +0200

csiph-web