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

From	Bart Van Assche <bvanassche@acm.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: upcoming conflict between the target-updates and target-bva trees
Date	2017-06-02 07:20 +0200
Message-ID	<tNNaa-4HT-9@gated-at.bofh.it> (permalink)
References	<tNLBn-3BC-5@gated-at.bofh.it> <tNM4q-40b-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On 06/01/17 21:03, Nicholas A. Bellinger wrote:
> On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
>> Last night the target-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.
> 
> Unfortunately, this is going to continue to be a problem once these
> patches are list reviewed, and included in target-updates.
> 
> Bart, can you please drop the patches?
Hello Stephen and Nic,

I have just reset that branch to v4.12-rc1. Sorry for the inconvenience.

Bart.

Back to linux.kernel | Previous | Next — Previous 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