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@xxxxxxxxxxxxxxxx
Attachment:
pgptju3gY5yCP.pgp
Description: PGP signature
