linux-kernel - linux-next: manual merge of the xtensa tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Date:	Fri, 14 Dec 2012 11:06:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Zankel <chris@...kel.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the xtensa tree with Linus' tree

Hi Chris,

Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/kernel/process.c between commit 3e41f9ba611c ("xtensa: switch
to generic clone()") from Linus' tree and commit 8daa277ae436 ("xtensa:
clean up files to make them code-style compliant") from the xtensa tree.

The former removes the function that is fixed up by the latter, so I just
removed it and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped