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
| ||
|
Date: Wed, 5 Jan 2011 13:35:57 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Grant Likely <grant.likely@...retlab.ca>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Sam Ravnborg <sam@...nborg.org>,
David Miller <davem@...emloft.net>,
Andres Salomon <dilinger@...ued.net>
Subject: linux-next: manual merge of the devicetree tree with the sparc tree
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/sparc/prom/tree_32.c between commit
1f42be484ffc5559a29466c82adac7dd472d4439 ("sparc: remove unused prom tree
functions") from the sparc tree and commit
4a3a255289e7e322b8044286cce85031990f888a ("sparc: explicitly cast
negative phandle checks to s32") from the devicetree tree.
The former removes the code modified by the latter, so I just removed it.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists