linux-kernel - Re: linux-next: manual merge of the devicetree tree with the microblaze 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: <fa686aa41002161338u25e58cc5m74e4b3c6e39b584b@mail.gmail.com>
Date:	Tue, 16 Feb 2010 14:38:04 -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,
	Michal Simek <michal.simek@...alogix.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the 
	microblaze tree

On Mon, Feb 15, 2010 at 12:13 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/microblaze/include/asm/prom.h between commit
> 8d0fd5d72f5bcc597427afd73c6d5ba97fe4780f ("microblaze: Enable PCI,
> missing files") from the microblaze tree and commit
> df0edeb59eb559be0bee53452fda2f5cc0ae133f ("of: remove undefined
> request_OF_resource & release_OF_resource") from the devicetree tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Michal, with respect to the current ongoing discussion, I hope you're
not planning on merging the microblaze PCI patches when Linus opens
the merge window.

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/