linux-kernel - linux-next: manual merge of the i.MX tree with the tree

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: <20110523114542.9868cba1.sfr@canb.auug.org.au>
Date:	Mon, 23 May 2011 11:45:42 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Sascha Hauer <s.hauer@...gutronix.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the i.MX tree with the  tree

Hi Sascha,

Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/mach-imx/Kconfig arch/arm/plat-mxc/Kconfig between the "same"
commits from the arm tree and the i.MX tree.

Please don't rearrange commits when upstreaming them - or if you do, then
update the source tree as well.  I am assuming that the commits that are
in the arm tree amount to the same as what has been int the i.MX tree for
some time.  There are a couple of extra commits in the i.MX tree, so I
just used the i.MX version of those files.   This may not work.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped