From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Christophe PLAGNIOL-VILLARD Subject: Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h Date: Mon, 12 Nov 2012 15:06:46 +0100 Message-ID: <20121112140646.GK4576@game.jcrosoft.org> References: <20121107111235.GH20063@game.jcrosoft.org> <1352287374-25176-1-git-send-email-plagnioj@jcrosoft.com> <1352287374-25176-2-git-send-email-plagnioj@jcrosoft.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: netdev-owner@vger.kernel.org To: Joachim Eastwood Cc: linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, linux-usb@vger.kernel.org, rtc-linux@googlegroups.com, linux-mmc@vger.kernel.org, linux-pcmcia@lists.infradead.org, Nicolas Ferre , linux-can@vger.kernel.org, linux-ide@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-input@vger.kernel.org, spi-devel-general@lists.sourceforge.net List-Id: linux-can.vger.kernel.org On 11:54 Sat 10 Nov , Joachim Eastwood wrote: > Hi Jean-Christophe, > > On 7 November 2012 12:22, Jean-Christophe PLAGNIOL-VILLARD > wrote: > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > > Cc: Nicolas Ferre > > Cc: linux-ide@vger.kernel.org > > Cc: linux-input@vger.kernel.org > > Cc: linux-mmc@vger.kernel.org > > Cc: linux-can@vger.kernel.org > > Cc: netdev@vger.kernel.org > > Cc: linux-pcmcia@lists.infradead.org > > Cc: rtc-linux@googlegroups.com > > Cc: spi-devel-general@lists.sourceforge.net > > Cc: linux-serial@vger.kernel.org > > Cc: linux-usb@vger.kernel.org > > Cc: linux-fbdev@vger.kernel.org > > --- > > HI all, > > > > If it's ok with everyone this will go via at91 > > with the patch serie than clean up the include/mach > > > > For preparation to switch to arm multiarch kernel > > > > Best Regards, > > J. > > arch/arm/mach-at91/include/mach/board.h | 55 ---------------------- > > arch/avr32/mach-at32ap/include/mach/board.h | 7 --- > > drivers/ata/pata_at91.c | 2 +- > > drivers/input/touchscreen/atmel_tsadcc.c | 2 +- > > drivers/mmc/host/atmel-mci.c | 2 +- > > drivers/net/can/at91_can.c | 3 +- > > drivers/net/ethernet/cadence/at91_ether.c | 2 +- > > drivers/pcmcia/at91_cf.c | 2 +- > > drivers/rtc/rtc-at91sam9.c | 2 +- > > drivers/spi/spi-atmel.c | 2 +- > > drivers/tty/serial/atmel_serial.c | 2 +- > > drivers/usb/gadget/at91_udc.c | 2 +- > > drivers/usb/gadget/atmel_usba_udc.c | 2 +- > > drivers/usb/host/ohci-at91.c | 2 +- > > drivers/video/atmel_lcdfb.c | 2 +- > > include/linux/platform_data/atmel.h | 67 +++++++++++++++++++++++++++ > > 16 files changed, 80 insertions(+), 76 deletions(-) > > > > > diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c > > index 4e980a7..35fc6edb 100644 > > --- a/drivers/net/ethernet/cadence/at91_ether.c > > +++ b/drivers/net/ethernet/cadence/at91_ether.c > > @@ -31,6 +31,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > #include > > @@ -38,7 +39,6 @@ > > > > #include > > #include > > -#include > > > > #include "at91_ether.h" > > The at91_ether driver in net-next does not need to be change since it > all mach includes has already been removed by other patches and it > includes linux/platform_data/macb.h directly. > > What tree was these patches based on? > The at91_ether driver changes has been in linux-next for a long while now. the conflict is minor easy to handle and the cleanup need to go first on arm soc so this is based on rc3 Best Regards, J. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 12 Nov 2012 14:06:46 +0000 Subject: Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h Message-Id: <20121112140646.GK4576@game.jcrosoft.org> List-Id: References: <20121107111235.GH20063@game.jcrosoft.org> <1352287374-25176-1-git-send-email-plagnioj@jcrosoft.com> <1352287374-25176-2-git-send-email-plagnioj@jcrosoft.com> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org On 11:54 Sat 10 Nov , Joachim Eastwood wrote: > Hi Jean-Christophe, > > On 7 November 2012 12:22, Jean-Christophe PLAGNIOL-VILLARD > wrote: > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > > Cc: Nicolas Ferre > > Cc: linux-ide@vger.kernel.org > > Cc: linux-input@vger.kernel.org > > Cc: linux-mmc@vger.kernel.org > > Cc: linux-can@vger.kernel.org > > Cc: netdev@vger.kernel.org > > Cc: linux-pcmcia@lists.infradead.org > > Cc: rtc-linux@googlegroups.com > > Cc: spi-devel-general@lists.sourceforge.net > > Cc: linux-serial@vger.kernel.org > > Cc: linux-usb@vger.kernel.org > > Cc: linux-fbdev@vger.kernel.org > > --- > > HI all, > > > > If it's ok with everyone this will go via at91 > > with the patch serie than clean up the include/mach > > > > For preparation to switch to arm multiarch kernel > > > > Best Regards, > > J. > > arch/arm/mach-at91/include/mach/board.h | 55 ---------------------- > > arch/avr32/mach-at32ap/include/mach/board.h | 7 --- > > drivers/ata/pata_at91.c | 2 +- > > drivers/input/touchscreen/atmel_tsadcc.c | 2 +- > > drivers/mmc/host/atmel-mci.c | 2 +- > > drivers/net/can/at91_can.c | 3 +- > > drivers/net/ethernet/cadence/at91_ether.c | 2 +- > > drivers/pcmcia/at91_cf.c | 2 +- > > drivers/rtc/rtc-at91sam9.c | 2 +- > > drivers/spi/spi-atmel.c | 2 +- > > drivers/tty/serial/atmel_serial.c | 2 +- > > drivers/usb/gadget/at91_udc.c | 2 +- > > drivers/usb/gadget/atmel_usba_udc.c | 2 +- > > drivers/usb/host/ohci-at91.c | 2 +- > > drivers/video/atmel_lcdfb.c | 2 +- > > include/linux/platform_data/atmel.h | 67 +++++++++++++++++++++++++++ > > 16 files changed, 80 insertions(+), 76 deletions(-) > > > > > diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c > > index 4e980a7..35fc6edb 100644 > > --- a/drivers/net/ethernet/cadence/at91_ether.c > > +++ b/drivers/net/ethernet/cadence/at91_ether.c > > @@ -31,6 +31,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > #include > > @@ -38,7 +39,6 @@ > > > > #include > > #include > > -#include > > > > #include "at91_ether.h" > > The at91_ether driver in net-next does not need to be change since it > all mach includes has already been removed by other patches and it > includes linux/platform_data/macb.h directly. > > What tree was these patches based on? > The at91_ether driver changes has been in linux-next for a long while now. the conflict is minor easy to handle and the cleanup need to go first on arm soc so this is based on rc3 Best Regards, J. From mboxrd@z Thu Jan 1 00:00:00 1970 From: plagnioj@jcrosoft.com (Jean-Christophe PLAGNIOL-VILLARD) Date: Mon, 12 Nov 2012 15:06:46 +0100 Subject: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h In-Reply-To: References: <20121107111235.GH20063@game.jcrosoft.org> <1352287374-25176-1-git-send-email-plagnioj@jcrosoft.com> <1352287374-25176-2-git-send-email-plagnioj@jcrosoft.com> Message-ID: <20121112140646.GK4576@game.jcrosoft.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 11:54 Sat 10 Nov , Joachim Eastwood wrote: > Hi Jean-Christophe, > > On 7 November 2012 12:22, Jean-Christophe PLAGNIOL-VILLARD > wrote: > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > > Cc: Nicolas Ferre > > Cc: linux-ide at vger.kernel.org > > Cc: linux-input at vger.kernel.org > > Cc: linux-mmc at vger.kernel.org > > Cc: linux-can at vger.kernel.org > > Cc: netdev at vger.kernel.org > > Cc: linux-pcmcia at lists.infradead.org > > Cc: rtc-linux at googlegroups.com > > Cc: spi-devel-general at lists.sourceforge.net > > Cc: linux-serial at vger.kernel.org > > Cc: linux-usb at vger.kernel.org > > Cc: linux-fbdev at vger.kernel.org > > --- > > HI all, > > > > If it's ok with everyone this will go via at91 > > with the patch serie than clean up the include/mach > > > > For preparation to switch to arm multiarch kernel > > > > Best Regards, > > J. > > arch/arm/mach-at91/include/mach/board.h | 55 ---------------------- > > arch/avr32/mach-at32ap/include/mach/board.h | 7 --- > > drivers/ata/pata_at91.c | 2 +- > > drivers/input/touchscreen/atmel_tsadcc.c | 2 +- > > drivers/mmc/host/atmel-mci.c | 2 +- > > drivers/net/can/at91_can.c | 3 +- > > drivers/net/ethernet/cadence/at91_ether.c | 2 +- > > drivers/pcmcia/at91_cf.c | 2 +- > > drivers/rtc/rtc-at91sam9.c | 2 +- > > drivers/spi/spi-atmel.c | 2 +- > > drivers/tty/serial/atmel_serial.c | 2 +- > > drivers/usb/gadget/at91_udc.c | 2 +- > > drivers/usb/gadget/atmel_usba_udc.c | 2 +- > > drivers/usb/host/ohci-at91.c | 2 +- > > drivers/video/atmel_lcdfb.c | 2 +- > > include/linux/platform_data/atmel.h | 67 +++++++++++++++++++++++++++ > > 16 files changed, 80 insertions(+), 76 deletions(-) > > > > > diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c > > index 4e980a7..35fc6edb 100644 > > --- a/drivers/net/ethernet/cadence/at91_ether.c > > +++ b/drivers/net/ethernet/cadence/at91_ether.c > > @@ -31,6 +31,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > #include > > @@ -38,7 +39,6 @@ > > > > #include > > #include > > -#include > > > > #include "at91_ether.h" > > The at91_ether driver in net-next does not need to be change since it > all mach includes has already been removed by other patches and it > includes linux/platform_data/macb.h directly. > > What tree was these patches based on? > The at91_ether driver changes has been in linux-next for a long while now. the conflict is minor easy to handle and the cleanup need to go first on arm soc so this is based on rc3 Best Regards, J.