Messages in this thread | | | From | Grant Likely <> | Date | Tue, 16 Feb 2010 14:38:04 -0700 | 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@canb.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.
| |