From: Gustavo Padovan <gustavo@padovan.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: bluetooth tree rewritten after being merged
Date: Mon, 24 Sep 2012 20:49:04 -0300 [thread overview]
Message-ID: <20120924234904.GC7922@joana> (raw)
In-Reply-To: <20120925085113.cd17b8e633f38b3f7deefd5c@canb.auug.org.au>
Hi Stephen,
* Stephen Rothwell <sfr@canb.auug.org.au> [2012-09-25 08:51:13 +1000]:
> Hi Gustavo, John,
>
> The bluetooth tree has been merged into the wireless tree (which is its
> normal path to Linus), but since that merge, the top four commits in the
> bluetooth tree have been rewritten. So now there will be two version of
> those commits in linux-next (and eventually Linus' tree, if nothing
> changes) and this will cause conflicts if there are further changes in
> either tree affecting the files in those four commits.
>
> Do *not* rewrite/rebase a tree once it has been merged "upstream".
> Preferably do *not* rewrite/rebase a tree once it has been published
> (unless it is specifically a tree that is never meant to be stable).
Yes, I was planning to redo the pull request but in the meantime John pulled
my tree. I'm fixing my tree right now to get rid of this issue. Thanks for
reporting.
Gustavo
prev parent reply other threads:[~2012-09-24 23:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 22:51 linux-next: bluetooth tree rewritten after being merged Stephen Rothwell
2012-09-24 23:49 ` Gustavo Padovan [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=20120924234904.GC7922@joana \
--to=gustavo@padovan.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--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;
as well as URLs for NNTP newsgroup(s).