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

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
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	Fri, 02 Jun 2017 07:20:02 +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>
X-Greylist	delayed 972 seconds by postgrey-1.27 at vger.kernel.org; Fri, 02 Jun 2017 01:12:09 EDT
User-Agent	Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8; format=flowed
Content-Language	en-US
Content-Transfer-Encoding	7bit
X-Ppp-Message-ID	<20170602045550.403917.28553@vz23.stone-is.net>
X-Ppp-Vhost	bartvanassche.be
X-Originating-IP	87.238.162.216
X-Spamexperts-Domain	1eurohost.be
X-Spamexperts-Username	vz23
Authentication-Results	bxl.stone.is; auth=pass (plain) smtp.auth=vz23@1eurohost.be
X-Spamexperts-Outgoing-Class	ham
X-Spamexperts-Outgoing-Evidence	SB/global_tokens (0.00735259464236)
X-Recommended-Action	accept
X-Filter-ID	s0sct1PQhAABKnZB5plbIYrcAt68paBzxGNV4bZScc+mnd4V2fz1McEr4Gzz6FwtiwQzKw+6v3Ca IMG6s7LqJLzSFx798DrvejFoeDV4/qV5JZzLdlCqM7yRlf5UcYHY70hXFOFIrCtPQIcoUyVy90k3 jnM12PruiOqtRsSSLk2WzHAdD7R3+xvQHtyo9/UTbpNiHPX1bpW29HpHECPmxKUMd/rp3TNaA+m3 TwToLOFpWcXGosh+B5zzjSsW/V8kykp+4eJC9uvqg/TBkyMdBZecjOJnOtAX81/JhAIF0+k21Cee 63EeltfbuaMMNA5XLo6b5kTEHJUms49v6w9b85HvTfhcqpbH8tmfkPjS+lh/89t57fy54rpST8dR /ckEGJKx5L1n7M3QYU9lMqpwytdobo1BSylU+5cz8N1AcrkWERWLy7OcjZZ8LO1UTYSqiG1Ko429 xet7vsrI1Npz33e49NyfMJPbyrkkeoEe8FvcXcSZX0SpmnTGchGFK/gYXOwB2zrkPSczIcC/HVeG 7xlfm41OLbcr5JGV9dp5S6qprYlvne0NUB5b+H12aIr4sGb3pbmxFaeiXaF9II08mrHZCwJgaBd8 E/wSuFcSlz6tI4g+l6rCWbY0MZcgnbHshD7cLsit+a0We2Nz7N83xPjtGRL7cf8T66fwV6J+vHOF RrbiLd43GcsMdHxxpvM3QcB4+c6+/0IgnG7AEzJEUluXZrHXrbSwvco0ifMJhDXnsXEBAaJKYpjf iKWbEgl33T/95Zg5CE3AhA2+uctitKL22lf4d/8+AtNKUJvxp4vrZbt6kcn0ODOScFtGEUc4dBKo BMUHPh+9zOPWUJOD21zk3OOIqcmDfjhYtaDmuvPbC8dt/CV3fELBVC/AS5Pvkxsy63KSV4Pe9FAd zt0orP/WLstymIK/l6dpXPWtISdTE8Kl8BEGGDT1fVMdycDCMS+4ayUpOtEhdxekWDmK9g==
X-Report-Abuse-To	spam@sf1.bxl.stone.is
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	19
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	Thu, 1 Jun 2017 21:55:47 -0700
X-Original-Message-ID	<1e3679b7-2812-8916-92f8-09d9cbd6deea@acm.org>
X-Original-References	<20170602133928.2afa3e7a@canb.auug.org.au> <1496376224.27407.228.camel@haakon3.risingtidesystems.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1655896

Show key headers only | 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