* linux-next: manual merge of the devicetree tree with the microblaze tree
@ 2010-02-15 7:13 Stephen Rothwell
2010-02-16 21:38 ` Grant Likely
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-02-15 7:13 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Michal Simek
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/microblaze/include/asm/prom.h
index 7675ce2,03f45a9..0000000
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@@ -40,32 -31,6 +31,21 @@@
/* Other Prototypes */
extern int early_uartlite_console(void);
+#ifdef CONFIG_PCI
+/*
+ * PCI <-> OF matching functions
+ * (XXX should these be here?)
+ */
+struct pci_bus;
+struct pci_dev;
+extern int pci_device_from_OF_node(struct device_node *node,
+ u8 *bus, u8 *devfn);
+extern struct device_node *pci_busdev_to_OF_node(struct pci_bus *bus,
+ int devfn);
+extern struct device_node *pci_device_to_OF_node(struct pci_dev *dev);
+extern void pci_create_OF_bus_map(void);
+#endif
+
- extern struct resource *request_OF_resource(struct device_node *node,
- int index, const char *name_postfix);
- extern int release_OF_resource(struct device_node *node, int index);
-
/*
* OF address retreival & translation
*/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the devicetree tree with the microblaze tree
2010-02-15 7:13 linux-next: manual merge of the devicetree tree with the microblaze tree Stephen Rothwell
@ 2010-02-16 21:38 ` Grant Likely
0 siblings, 0 replies; 4+ messages in thread
From: Grant Likely @ 2010-02-16 21:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Michal Simek
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the devicetree tree with the microblaze tree
@ 2010-07-27 3:17 Stephen Rothwell
2010-07-27 3:19 ` Grant Likely
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-07-27 3:17 UTC (permalink / raw)
To: Grant Likely
Cc: linux-next, linux-kernel, Jonas Bonn, Steven J. Magnani,
Michal Simek
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/microblaze/kernel/Makefile between commit
117aa948321f3b019d9d8160591dc8256a6035cd ("microblaze: Add stack
unwinder") from the microblaze tree and commit
c0dd394ca5e78649b7013c3ce2d6338af9f228f0 ("of: remove
of_default_bus_ids") from the devicetree tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/microblaze/kernel/Makefile
index d66ddef,7fcc5f7..0000000
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@@ -15,9 -15,9 +15,9 @@@ endi
extra-y := head.o vmlinux.lds
obj-y += dma.o exceptions.o \
- hw_exception_handler.o init_task.o intc.o irq.o of_device.o \
- of_platform.o process.o prom.o prom_parse.o ptrace.o \
+ hw_exception_handler.o init_task.o intc.o irq.o \
+ process.o prom.o prom_parse.o ptrace.o \
- setup.o signal.o sys_microblaze.o timer.o traps.o reset.o
+ reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
obj-y += cpu/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the devicetree tree with the microblaze tree
2010-07-27 3:17 Stephen Rothwell
@ 2010-07-27 3:19 ` Grant Likely
0 siblings, 0 replies; 4+ messages in thread
From: Grant Likely @ 2010-07-27 3:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Jonas Bonn, Steven J. Magnani,
Michal Simek
On Mon, Jul 26, 2010 at 9:17 PM, 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/kernel/Makefile between commit
> 117aa948321f3b019d9d8160591dc8256a6035cd ("microblaze: Add stack
> unwinder") from the microblaze tree and commit
> c0dd394ca5e78649b7013c3ce2d6338af9f228f0 ("of: remove
> of_default_bus_ids") from the devicetree tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks Stephen. Looks right to me.
g.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/microblaze/kernel/Makefile
> index d66ddef,7fcc5f7..0000000
> --- a/arch/microblaze/kernel/Makefile
> +++ b/arch/microblaze/kernel/Makefile
> @@@ -15,9 -15,9 +15,9 @@@ endi
> extra-y := head.o vmlinux.lds
>
> obj-y += dma.o exceptions.o \
> - hw_exception_handler.o init_task.o intc.o irq.o of_device.o \
> - of_platform.o process.o prom.o prom_parse.o ptrace.o \
> + hw_exception_handler.o init_task.o intc.o irq.o \
> + process.o prom.o prom_parse.o ptrace.o \
> - setup.o signal.o sys_microblaze.o timer.o traps.o reset.o
> + reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
>
> obj-y += cpu/
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-27 3:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-15 7:13 linux-next: manual merge of the devicetree tree with the microblaze tree Stephen Rothwell
2010-02-16 21:38 ` Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2010-07-27 3:17 Stephen Rothwell
2010-07-27 3:19 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).