linux-kernel - Re: linux-next: manual merge of the devicetree 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <AANLkTilI_iZCD1S-LTmYgnCnUnbwhX3t-kEV9CUHEjFW@mail.gmail.com>
Date:	Thu, 15 Jul 2010 22:27:49 -0600
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,
	Yinghai Lu <yinghai@...nel.org>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Andres Salomon <dilinger@...ued.net>
Subject: Re: linux-next: manual merge of the devicetree tree with Linus' tree

On Thu, Jul 15, 2010 at 7:15 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/sparc/kernel/prom_64.c between commit
> 95f72d1ed41a66f1c1c29c24d479de81a0bea36f ("lmb: rename to memblock") from
> Linus' tree and commit 035ebefc737cce56d3938e9b7eaa5ac0e9c28715
> ("of/sparc: move is_root_node() to of.h") from the devicetree tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix for
> a while.

Okay, thanks Stephen.

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