* OMAP2-only kernel compile broken
@ 2011-07-10 1:57 Paul Walmsley
2011-07-10 9:52 ` Felipe Balbi
0 siblings, 1 reply; 13+ messages in thread
From: Paul Walmsley @ 2011-07-10 1:57 UTC (permalink / raw)
To: balbi, hemahk; +Cc: tony, linux-omap
Hello Hema, Felipe,
Commits 208466dc10083e734a8af71d10f923ee4bff950c ("usb: otg:
OMAP4430: Powerdown the internal PHY when USB is disabled") and
fb91cde49c327ff957c55d91805bc6abda59b311 ("usb: musb: OMAP4430:
Power down the PHY during board init") break compilation on OMAP2:
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to `omap4430_phy_init'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to `omap4430_phy_exit'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to `omap4430_phy_power'
arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to `omap4430_phy_set_clk'
arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to `omap4430_phy_suspend'
make: *** [.tmp_vmlinux1] Error 1
Could you please figure out a clean way to fix this for the 3.1 rc series?
thanks,
- Paul
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-10 1:57 OMAP2-only kernel compile broken Paul Walmsley
@ 2011-07-10 9:52 ` Felipe Balbi
2011-07-10 10:35 ` Santosh Shilimkar
2011-07-10 11:43 ` Paul Walmsley
0 siblings, 2 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-07-10 9:52 UTC (permalink / raw)
To: Paul Walmsley; +Cc: balbi, hemahk, tony, linux-omap
[-- Attachment #1.1: Type: text/plain, Size: 1071 bytes --]
Hi,
On Sat, Jul 09, 2011 at 07:57:20PM -0600, Paul Walmsley wrote:
> Hello Hema, Felipe,
>
> Commits 208466dc10083e734a8af71d10f923ee4bff950c ("usb: otg:
> OMAP4430: Powerdown the internal PHY when USB is disabled") and
> fb91cde49c327ff957c55d91805bc6abda59b311 ("usb: musb: OMAP4430:
> Power down the PHY during board init") break compilation on OMAP2:
>
> LD .tmp_vmlinux1
> arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to `omap4430_phy_init'
> arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to `omap4430_phy_exit'
> arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to `omap4430_phy_power'
> arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to `omap4430_phy_set_clk'
> arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to `omap4430_phy_suspend'
> make: *** [.tmp_vmlinux1] Error 1
>
>
> Could you please figure out a clean way to fix this for the 3.1 rc series?
Patch attached, if you want to queue it for the merge window.
--
balbi
[-- Attachment #1.2: 0001-usb-musb-fix-build-breakage.diff --]
[-- Type: text/x-diff, Size: 2532 bytes --]
From 0b355cb203be6efe839f60edfc29c8ccf8048e4a Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Sun, 10 Jul 2011 12:22:20 +0300
Subject: [PATCH] usb: musb: fix build breakage
Organization: Texas Instruments\n
This patch fixes the compilation brekage which
commits 208466dc ("usb: otg:OMAP4430: Powerdown
the internal PHY when USB is disabled") and
fb91cde4 ("usb: musb: OMAP4430: Power down
the PHY during board init") introduced when
building a OMAP2-only kernel.
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to
+`omap4430_phy_init'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to
+`omap4430_phy_exit'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to
+`omap4430_phy_power'
arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to
+`omap4430_phy_set_clk'
arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to
+`omap4430_phy_suspend'
make: *** [.tmp_vmlinux1] Error 1
Cc: stable@kernel.org
Reported-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/plat-omap/include/plat/usb.h | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 17d3c93..99dd64e 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -103,11 +103,25 @@ extern void usbhs_init(const struct usbhs_omap_board_data *pdata);
extern int omap_usbhs_enable(struct device *dev);
extern void omap_usbhs_disable(struct device *dev);
+#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP3)
extern int omap4430_phy_power(struct device *dev, int ID, int on);
extern int omap4430_phy_set_clk(struct device *dev, int on);
extern int omap4430_phy_init(struct device *dev);
extern int omap4430_phy_exit(struct device *dev);
extern int omap4430_phy_suspend(struct device *dev, int suspend);
+#else
+static inline int omap4430_phy_power(struct device *d, int i, int o)
+{ return 0; }
+static inline int omap4430_phy_set_clock(struct device *d, int o)
+{ return 0; }
+static inline int omap4430_phy_init(struct device *d)
+{ return 0; }
+static inline int omap4430_phy_exit(struct device *d)
+{ return 0; }
+static inline int omap4430_phy_suspend(struct device *d, int s)
+{ return 0; }
+#endif
+
#endif
extern void am35x_musb_reset(void);
--
1.7.6
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-10 9:52 ` Felipe Balbi
@ 2011-07-10 10:35 ` Santosh Shilimkar
2011-07-10 11:43 ` Paul Walmsley
1 sibling, 0 replies; 13+ messages in thread
From: Santosh Shilimkar @ 2011-07-10 10:35 UTC (permalink / raw)
To: balbi; +Cc: Paul Walmsley, hemahk, tony, linux-omap
Felipe,
On 7/10/2011 2:52 AM, Felipe Balbi wrote:
> From: Felipe Balbi<balbi@ti.com>
> Date: Sun, 10 Jul 2011 12:22:20 +0300
> Subject: [PATCH] usb: musb: fix build breakage
> Organization: Texas Instruments\n
>
> This patch fixes the compilation brekage which
> commits 208466dc ("usb: otg:OMAP4430: Powerdown
> the internal PHY when USB is disabled") and
> fb91cde4 ("usb: musb: OMAP4430: Power down
> the PHY during board init") introduced when
> building a OMAP2-only kernel.
>
> LD .tmp_vmlinux1
> arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to
> +`omap4430_phy_init'
> arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to
> +`omap4430_phy_exit'
> arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to
> +`omap4430_phy_power'
> arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to
> +`omap4430_phy_set_clk'
> arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to
> +`omap4430_phy_suspend'
> make: *** [.tmp_vmlinux1] Error 1
>
> Cc:stable@kernel.org
> Reported-by: Paul Walmsley<paul@pwsan.com>
> Signed-off-by: Felipe Balbi<balbi@ti.com>
> ---
> arch/arm/plat-omap/include/plat/usb.h | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
> index 17d3c93..99dd64e 100644
> --- a/arch/arm/plat-omap/include/plat/usb.h
> +++ b/arch/arm/plat-omap/include/plat/usb.h
> @@ -103,11 +103,25 @@ extern void usbhs_init(const struct usbhs_omap_board_data *pdata);
> extern int omap_usbhs_enable(struct device *dev);
> extern void omap_usbhs_disable(struct device *dev);
>
> +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP3)
> extern int omap4430_phy_power(struct device *dev, int ID, int on);
> extern int omap4430_phy_set_clk(struct device *dev, int on);
> extern int omap4430_phy_init(struct device *dev);
> extern int omap4430_phy_exit(struct device *dev);
> extern int omap4430_phy_suspend(struct device *dev, int suspend);
The comment is not related to this patch, but are above functions
limited to _omap4430_ only or omap446x may also need them. If the
phy is same on all OMAP4 devices, then another patch with renaming
all these functions to omap4_* should be done. Or even better is
make use of phy IP name itslef.
Regrads,
Santosh
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-10 9:52 ` Felipe Balbi
2011-07-10 10:35 ` Santosh Shilimkar
@ 2011-07-10 11:43 ` Paul Walmsley
2011-07-11 6:21 ` Felipe Balbi
2011-07-11 6:57 ` Felipe Balbi
1 sibling, 2 replies; 13+ messages in thread
From: Paul Walmsley @ 2011-07-10 11:43 UTC (permalink / raw)
To: Felipe Balbi; +Cc: hemahk, tony, linux-omap
On Sun, 10 Jul 2011, Felipe Balbi wrote:
> On Sat, Jul 09, 2011 at 07:57:20PM -0600, Paul Walmsley wrote:
> > Hello Hema, Felipe,
> >
> > Commits 208466dc10083e734a8af71d10f923ee4bff950c ("usb: otg:
> > OMAP4430: Powerdown the internal PHY when USB is disabled") and
> > fb91cde49c327ff957c55d91805bc6abda59b311 ("usb: musb: OMAP4430:
> > Power down the PHY during board init") break compilation on OMAP2:
> >
> > LD .tmp_vmlinux1
> > arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to `omap4430_phy_init'
> > arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to `omap4430_phy_exit'
> > arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to `omap4430_phy_power'
> > arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to `omap4430_phy_set_clk'
> > arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to `omap4430_phy_suspend'
> > make: *** [.tmp_vmlinux1] Error 1
> >
> >
> > Could you please figure out a clean way to fix this for the 3.1 rc series?
>
> Patch attached, if you want to queue it for the merge window.
This patch doesn't build when based on the arm-soc omap/cleanup branch.
arch/arm/mach-omap2/twl-common.c:55:19: error: 'omap4430_phy_set_clk'
undeclared here (not in a function)
- Paul
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-10 11:43 ` Paul Walmsley
@ 2011-07-11 6:21 ` Felipe Balbi
2011-07-11 6:31 ` Paul Walmsley
2011-07-11 6:57 ` Felipe Balbi
1 sibling, 1 reply; 13+ messages in thread
From: Felipe Balbi @ 2011-07-11 6:21 UTC (permalink / raw)
To: Paul Walmsley; +Cc: Felipe Balbi, hemahk, tony, linux-omap
[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]
Hi,
On Sun, Jul 10, 2011 at 05:43:23AM -0600, Paul Walmsley wrote:
> On Sun, 10 Jul 2011, Felipe Balbi wrote:
>
> > On Sat, Jul 09, 2011 at 07:57:20PM -0600, Paul Walmsley wrote:
> > > Hello Hema, Felipe,
> > >
> > > Commits 208466dc10083e734a8af71d10f923ee4bff950c ("usb: otg:
> > > OMAP4430: Powerdown the internal PHY when USB is disabled") and
> > > fb91cde49c327ff957c55d91805bc6abda59b311 ("usb: musb: OMAP4430:
> > > Power down the PHY during board init") break compilation on OMAP2:
> > >
> > > LD .tmp_vmlinux1
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to `omap4430_phy_init'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to `omap4430_phy_exit'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to `omap4430_phy_power'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to `omap4430_phy_set_clk'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to `omap4430_phy_suspend'
> > > make: *** [.tmp_vmlinux1] Error 1
> > >
> > >
> > > Could you please figure out a clean way to fix this for the 3.1 rc series?
> >
> > Patch attached, if you want to queue it for the merge window.
>
> This patch doesn't build when based on the arm-soc omap/cleanup branch.
>
> arch/arm/mach-omap2/twl-common.c:55:19: error: 'omap4430_phy_set_clk'
> undeclared here (not in a function)
What on earth is arm-soc omap/cleanup branch ? I generally base my
patches off of Linus' tags. This one in particular was based off of
3.0-rc6 (or -rc5, can't quite remember). Where is this particular branch
I should base off ?
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-11 6:21 ` Felipe Balbi
@ 2011-07-11 6:31 ` Paul Walmsley
2011-07-11 6:42 ` Paul Walmsley
2011-07-11 6:43 ` Felipe Balbi
0 siblings, 2 replies; 13+ messages in thread
From: Paul Walmsley @ 2011-07-11 6:31 UTC (permalink / raw)
To: Felipe Balbi; +Cc: hemahk, tony, linux-omap
On Mon, 11 Jul 2011, Felipe Balbi wrote:
> What on earth is arm-soc omap/cleanup branch ? I generally base my
> patches off of Linus' tags. This one in particular was based off of
> 3.0-rc6 (or -rc5, can't quite remember). Where is this particular branch
> I should base off ?
git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git
This is Tony's new upstream tree.
Branch is 'omap/cleanup' in this case.
- Paul
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-11 6:31 ` Paul Walmsley
@ 2011-07-11 6:42 ` Paul Walmsley
2011-07-11 6:43 ` Felipe Balbi
1 sibling, 0 replies; 13+ messages in thread
From: Paul Walmsley @ 2011-07-11 6:42 UTC (permalink / raw)
To: Felipe Balbi; +Cc: hemahk, tony, linux-omap
On Mon, 11 Jul 2011, Paul Walmsley wrote:
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git
>
> This is Tony's new upstream tree.
I guess this was unclear. This is the tree that is maintained by Arnd,
Nico, etc., and that Tony and some of the other ARM maintainers are
submitting branches to.
- Paul
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-11 6:31 ` Paul Walmsley
2011-07-11 6:42 ` Paul Walmsley
@ 2011-07-11 6:43 ` Felipe Balbi
2011-07-11 8:26 ` Tony Lindgren
1 sibling, 1 reply; 13+ messages in thread
From: Felipe Balbi @ 2011-07-11 6:43 UTC (permalink / raw)
To: Paul Walmsley; +Cc: Felipe Balbi, hemahk, tony, linux-omap
[-- Attachment #1: Type: text/plain, Size: 641 bytes --]
On Mon, Jul 11, 2011 at 12:31:30AM -0600, Paul Walmsley wrote:
> On Mon, 11 Jul 2011, Felipe Balbi wrote:
>
> > What on earth is arm-soc omap/cleanup branch ? I generally base my
> > patches off of Linus' tags. This one in particular was based off of
> > 3.0-rc6 (or -rc5, can't quite remember). Where is this particular branch
> > I should base off ?
>
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git
>
> This is Tony's new upstream tree.
>
> Branch is 'omap/cleanup' in this case.
Ok, thanks for letting me know.
Tony, should we *always* base patches for you off of that tree ??
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-10 11:43 ` Paul Walmsley
2011-07-11 6:21 ` Felipe Balbi
@ 2011-07-11 6:57 ` Felipe Balbi
1 sibling, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-07-11 6:57 UTC (permalink / raw)
To: Paul Walmsley; +Cc: Felipe Balbi, hemahk, tony, linux-omap
[-- Attachment #1.1: Type: text/plain, Size: 1636 bytes --]
hi,
On Sun, Jul 10, 2011 at 05:43:23AM -0600, Paul Walmsley wrote:
> On Sun, 10 Jul 2011, Felipe Balbi wrote:
>
> > On Sat, Jul 09, 2011 at 07:57:20PM -0600, Paul Walmsley wrote:
> > > Hello Hema, Felipe,
> > >
> > > Commits 208466dc10083e734a8af71d10f923ee4bff950c ("usb: otg:
> > > OMAP4430: Powerdown the internal PHY when USB is disabled") and
> > > fb91cde49c327ff957c55d91805bc6abda59b311 ("usb: musb: OMAP4430:
> > > Power down the PHY during board init") break compilation on OMAP2:
> > >
> > > LD .tmp_vmlinux1
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to `omap4430_phy_init'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to `omap4430_phy_exit'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to `omap4430_phy_power'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to `omap4430_phy_set_clk'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to `omap4430_phy_suspend'
> > > make: *** [.tmp_vmlinux1] Error 1
> > >
> > >
> > > Could you please figure out a clean way to fix this for the 3.1 rc series?
> >
> > Patch attached, if you want to queue it for the merge window.
>
> This patch doesn't build when based on the arm-soc omap/cleanup branch.
>
> arch/arm/mach-omap2/twl-common.c:55:19: error: 'omap4430_phy_set_clk'
> undeclared here (not in a function)
new version attached. It's always compiling omap_phy_internal.c as we
always compile usb-musb.c and twl-common.c. Later I'll come up with a
better solution for this issue.
--
balbi
[-- Attachment #1.2: 0001-usb-musb-fix-build-breakage.diff --]
[-- Type: text/x-diff, Size: 2334 bytes --]
From 1de870130718c3aef8db86006e9fa5389bc4059f Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Sun, 10 Jul 2011 12:22:20 +0300
Subject: [PATCH] usb: musb: fix build breakage
Organization: Texas Instruments\n
This patch fixes the compilation brekage which
commits 208466dc ("usb: otg:OMAP4430: Powerdown
the internal PHY when USB is disabled") and
fb91cde4 ("usb: musb: OMAP4430: Power down
the PHY during board init") introduced when
building a OMAP2-only kernel.
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to
+`omap4430_phy_init'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to
+`omap4430_phy_exit'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to
+`omap4430_phy_power'
arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to
+`omap4430_phy_set_clk'
arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to
+`omap4430_phy_suspend'
make: *** [.tmp_vmlinux1] Error 1
Reported-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/Makefile | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index ff1466f..455231c 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -232,14 +232,11 @@ obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \
obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
hsmmc.o
obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \
- hsmmc.o \
- omap_phy_internal.o
+ hsmmc.o
obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \
- hsmmc.o \
- omap_phy_internal.o
+ hsmmc.o
-obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o \
- omap_phy_internal.o \
+obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o
@@ -250,6 +247,8 @@ obj-$(CONFIG_MACH_TI8168EVM) += board-ti8168evm.o
usbfs-$(CONFIG_ARCH_OMAP_OTG) := usb-fs.o
obj-y += $(usbfs-m) $(usbfs-y)
obj-y += usb-musb.o
+obj-y += omap_phy_internal.o
+
obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o
obj-y += usb-host.o
--
1.7.6
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-11 6:43 ` Felipe Balbi
@ 2011-07-11 8:26 ` Tony Lindgren
2011-07-11 9:24 ` Felipe Balbi
0 siblings, 1 reply; 13+ messages in thread
From: Tony Lindgren @ 2011-07-11 8:26 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Paul Walmsley, hemahk, linux-omap
* Felipe Balbi <balbi@ti.com> [110710 23:38]:
> On Mon, Jul 11, 2011 at 12:31:30AM -0600, Paul Walmsley wrote:
> > On Mon, 11 Jul 2011, Felipe Balbi wrote:
> >
> > > What on earth is arm-soc omap/cleanup branch ? I generally base my
> > > patches off of Linus' tags. This one in particular was based off of
> > > 3.0-rc6 (or -rc5, can't quite remember). Where is this particular branch
> > > I should base off ?
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git
> >
> > This is Tony's new upstream tree.
> >
> > Branch is 'omap/cleanup' in this case.
Please don't use those branches for basing patches unless specifically
agreed on.
> Ok, thanks for letting me know.
>
> Tony, should we *always* base patches for you off of that tree ??
No please don't. Arnd will merge things into those branches to build
his topic specif branches for merging. Always use mainline Linux tags
where possible, or static branches in linux-omap tree that have been
specifically pointed out.
We want to keep dependencies to other trees minimal as they may pull
in other patches too. It also makes it harder to keep track of the
the omap specific code, and makes it harder to do topic specific pull
requests easily.
For example, most patches done against current devel-board should
merge fine with everything else.
Regards,
Tony
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-11 8:26 ` Tony Lindgren
@ 2011-07-11 9:24 ` Felipe Balbi
2011-08-15 15:44 ` Paul Walmsley
0 siblings, 1 reply; 13+ messages in thread
From: Felipe Balbi @ 2011-07-11 9:24 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Felipe Balbi, Paul Walmsley, hemahk, linux-omap
[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]
Hi,
On Mon, Jul 11, 2011 at 01:26:50AM -0700, Tony Lindgren wrote:
> * Felipe Balbi <balbi@ti.com> [110710 23:38]:
> > On Mon, Jul 11, 2011 at 12:31:30AM -0600, Paul Walmsley wrote:
> > > On Mon, 11 Jul 2011, Felipe Balbi wrote:
> > >
> > > > What on earth is arm-soc omap/cleanup branch ? I generally base my
> > > > patches off of Linus' tags. This one in particular was based off of
> > > > 3.0-rc6 (or -rc5, can't quite remember). Where is this particular branch
> > > > I should base off ?
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git
> > >
> > > This is Tony's new upstream tree.
> > >
> > > Branch is 'omap/cleanup' in this case.
>
> Please don't use those branches for basing patches unless specifically
> agreed on.
>
> > Ok, thanks for letting me know.
> >
> > Tony, should we *always* base patches for you off of that tree ??
>
> No please don't. Arnd will merge things into those branches to build
> his topic specif branches for merging. Always use mainline Linux tags
> where possible, or static branches in linux-omap tree that have been
> specifically pointed out.
>
> We want to keep dependencies to other trees minimal as they may pull
> in other patches too. It also makes it harder to keep track of the
> the omap specific code, and makes it harder to do topic specific pull
> requests easily.
>
> For example, most patches done against current devel-board should
> merge fine with everything else.
good to know, I checked that the v2 I sent for Paul applies fine on
3.0-rc6, so there shouldn't be any issues ;-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-07-11 9:24 ` Felipe Balbi
@ 2011-08-15 15:44 ` Paul Walmsley
2011-08-15 16:02 ` Felipe Balbi
0 siblings, 1 reply; 13+ messages in thread
From: Paul Walmsley @ 2011-08-15 15:44 UTC (permalink / raw)
To: hemahk, Felipe Balbi; +Cc: Tony Lindgren, linux-omap, Péter Ujfalusi
[-- Attachment #1: Type: TEXT/PLAIN, Size: 237 bytes --]
Hi Felipe, Hema,
just wanted to send a quick note - sorry to misidentify your patches as
the proximate cause of the compile breakage described in this thread. As
RMK mentioned, I should have nagged Péter instead :-)
- Paul
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: OMAP2-only kernel compile broken
2011-08-15 15:44 ` Paul Walmsley
@ 2011-08-15 16:02 ` Felipe Balbi
0 siblings, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-08-15 16:02 UTC (permalink / raw)
To: Paul Walmsley
Cc: hemahk, Felipe Balbi, Tony Lindgren, linux-omap,
Péter Ujfalusi
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
Hi,
On Mon, Aug 15, 2011 at 09:44:25AM -0600, Paul Walmsley wrote:
> just wanted to send a quick note - sorry to misidentify your patches as
> the proximate cause of the compile breakage described in this thread. As
> RMK mentioned, I should have nagged Péter instead :-)
np
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-08-15 16:09 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-10 1:57 OMAP2-only kernel compile broken Paul Walmsley
2011-07-10 9:52 ` Felipe Balbi
2011-07-10 10:35 ` Santosh Shilimkar
2011-07-10 11:43 ` Paul Walmsley
2011-07-11 6:21 ` Felipe Balbi
2011-07-11 6:31 ` Paul Walmsley
2011-07-11 6:42 ` Paul Walmsley
2011-07-11 6:43 ` Felipe Balbi
2011-07-11 8:26 ` Tony Lindgren
2011-07-11 9:24 ` Felipe Balbi
2011-08-15 15:44 ` Paul Walmsley
2011-08-15 16:02 ` Felipe Balbi
2011-07-11 6:57 ` Felipe Balbi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.