| Message ID | 1414231739-7447-1-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Date: Sat, 25 Oct 2014 12:08:59 +0200 > Do not add phy include to the board file but platform_data include > instead. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > --- > David, > > I should have compile tested this patch earlier. I did now on > pxa168_defconfig right after I received an 0-day kbuild error > on this patch. > > This is the corresponding fix, can you please squash it in? > > Thanks and sorry for the noise, Patch applied to net-next, but: 1) There is never any way for me to "squash" a patch into an old one. Once I apply a patch it is a permanent commit in my tree and cannot be undone and/or modified. Therefore the only thing you can do is send me a relative fix and that's what shows up in my tree as yet another later commit. 2) Always be specific about the target tree in you subject, line. Never assume I can figure it out by context. Thanks.
On 28.10.2014 21:49, David Miller wrote: > From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Date: Sat, 25 Oct 2014 12:08:59 +0200 > >> Do not add phy include to the board file but platform_data include >> instead. >> >> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >> --- >> David, >> >> I should have compile tested this patch earlier. I did now on >> pxa168_defconfig right after I received an 0-day kbuild error >> on this patch. >> >> This is the corresponding fix, can you please squash it in? >> >> Thanks and sorry for the noise, > > Patch applied to net-next, but: > > 1) There is never any way for me to "squash" a patch into an old > one. Once I apply a patch it is a permanent commit in my tree > and cannot be undone and/or modified. > > Therefore the only thing you can do is send me a relative fix > and that's what shows up in my tree as yet another later commit. Ok, good to know and sorry for the crippled fixup patch. I was assuming that net-next is also rebased until pulled/moved to some stable state. > 2) Always be specific about the target tree in you subject, > line. Never assume I can figure it out by context. Also, sorry for the little information given. Thanks, Sebastian
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index 3b5794cd0357..22762a1f9f72 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -12,7 +12,6 @@ #include <linux/platform_device.h> #include <linux/gpio.h> #include <linux/gpio-pxa.h> -#include <linux/phy.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> diff --git a/include/linux/pxa168_eth.h b/include/linux/pxa168_eth.h index 37c381120bc8..e1ab6e86cdb3 100644 --- a/include/linux/pxa168_eth.h +++ b/include/linux/pxa168_eth.h @@ -4,6 +4,8 @@ #ifndef __LINUX_PXA168_ETH_H #define __LINUX_PXA168_ETH_H +#include <linux/phy.h> + struct pxa168_eth_platform_data { int port_number; int phy_addr;
Do not add phy include to the board file but platform_data include instead. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- David, I should have compile tested this patch earlier. I did now on pxa168_defconfig right after I received an 0-day kbuild error on this patch. This is the corresponding fix, can you please squash it in? Thanks and sorry for the noise, Sebastian Cc: "David S. Miller" <davem@davemloft.net> Cc: Antoine Tenart <antoine.tenart@free-electrons.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-mmp/gplugd.c | 1 - include/linux/pxa168_eth.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)