| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20120924234904.GC7922@joana> Date: Mon, 24 Sep 2012 20:49:04 -0300 From: Gustavo Padovan <gustavo@...ovan.org> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: "John W. Linville" <linville@...driver.com>, linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org> Subject: Re: linux-next: bluetooth tree rewritten after being merged Hi Stephen, * Stephen Rothwell <sfr@...b.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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists