* linux-next: bluetooth tree rewritten after being merged
@ 2012-09-24 22:51 Stephen Rothwell
2012-09-24 23:49 ` Gustavo Padovan
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-09-24 22:51 UTC (permalink / raw)
To: Gustavo Padovan; +Cc: John W. Linville, linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: bluetooth tree rewritten after being merged
2012-09-24 22:51 linux-next: bluetooth tree rewritten after being merged Stephen Rothwell
@ 2012-09-24 23:49 ` Gustavo Padovan
0 siblings, 0 replies; 2+ messages in thread
From: Gustavo Padovan @ 2012-09-24 23:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, LKML
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-24 23:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-24 22:51 linux-next: bluetooth tree rewritten after being merged Stephen Rothwell
2012-09-24 23:49 ` Gustavo Padovan
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).