Hi Stephen,

* Stephen Rothwell [off-list ref] [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