From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi•org>,
Bart Van Assche <bart.vanassche@gmail•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: upcoming conflict between the target-updates and target-bva trees
Date: Fri, 2 Jun 2017 13:39:28 +1000 [thread overview]
Message-ID: <20170602133928.2afa3e7a@canb.auug.org.au> (raw)
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.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-06-02 3:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 3:39 Stephen Rothwell [this message]
2017-06-02 4:03 ` linux-next: upcoming conflict between the target-updates and target-bva trees Nicholas A. Bellinger
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=20170602133928.2afa3e7a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bart.vanassche@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nab@linux-iscsi$(echo .)org \
/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