From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bart Van Assche <bart.vanassche@gmail.com>,
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, 01 Jun 2017 21:03:44 -0700 [thread overview]
Message-ID: <1496376224.27407.228.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <20170602133928.2afa3e7a@canb.auug.org.au>
On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
> 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.
>
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 until they are list reviewed so
there isn't a constant stream of merge conflicts in linux-next for your
un-reviewed code..?
next prev parent reply other threads:[~2017-06-02 4:03 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 [this message]
2017-06-02 4:55 ` Bart Van Assche
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=1496376224.27407.228.camel@haakon3.risingtidesystems.com \
--to=nab@linux-iscsi.org \
--cc=bart.vanassche@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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