From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751169AbdFBFMM (ORCPT ); Fri, 2 Jun 2017 01:12:12 -0400 Received: from bxl-001.se.1eurohost.be ([87.238.167.208]:55107 "EHLO bxl-001.se.1eurohost.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747AbdFBFMK (ORCPT ); Fri, 2 Jun 2017 01:12:10 -0400 X-Greylist: delayed 972 seconds by postgrey-1.27 at vger.kernel.org; Fri, 02 Jun 2017 01:12:09 EDT Subject: Re: linux-next: upcoming conflict between the target-updates and target-bva trees To: "Nicholas A. Bellinger" , Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List References: <20170602133928.2afa3e7a@canb.auug.org.au> <1496376224.27407.228.camel@haakon3.risingtidesystems.com> From: Bart Van Assche Message-ID: <1e3679b7-2812-8916-92f8-09d9cbd6deea@acm.org> Date: Thu, 1 Jun 2017 21:55:47 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <1496376224.27407.228.camel@haakon3.risingtidesystems.com> 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.