linux-kernel - linux-next: bluetooth tree rewritten after being merged

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120925085113.cd17b8e633f38b3f7deefd5c@canb.auug.org.au>
Date:	Tue, 25 Sep 2012 08:51:13 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Gustavo Padovan <gustavo@...ovan.org>
Cc:	"John W. Linville" <linville@...driver.com>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: linux-next: bluetooth tree rewritten after being merged

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@...b.auug.org.au

Content of type "application/pgp-signature" skipped