From: Bart Van Assche <bvanassche@acm•org>
To: "Nicholas A. Bellinger" <nab@linux-iscsi•org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: upcoming conflict between the target-updates and target-bva trees
Date: Thu, 1 Jun 2017 21:55:47 -0700 [thread overview]
Message-ID: <1e3679b7-2812-8916-92f8-09d9cbd6deea@acm.org> (raw)
In-Reply-To: <1496376224.27407.228.camel@haakon3.risingtidesystems.com>
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.
prev parent reply other threads:[~2017-06-02 5:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 3:39 linux-next: upcoming conflict between the target-updates and target-bva trees Stephen Rothwell
2017-06-02 4:03 ` Nicholas A. Bellinger
2017-06-02 4:55 ` Bart Van Assche [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1e3679b7-2812-8916-92f8-09d9cbd6deea@acm.org \
--to=bvanassche@acm$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nab@linux-iscsi$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox