linux-kernel - Re: linux-next: manual merge of the devicetree tree with the sparc 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-prev] [day] [month] [year] [list]

Message-ID: <20110105161700.GB17272@angua.secretlab.ca>
Date:	Wed, 5 Jan 2011 09:17:00 -0700
From:	Grant Likely <grant.likely@...retlab.ca>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the devicetree tree with the sparc
 tree

On Wed, Jan 05, 2011 at 01:35:57PM +1100, Stephen Rothwell wrote:
> 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.

Okay, thanks Stephen.

g.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> http://www.canb.auug.org.au/~sfr/


--
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/