| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 9 Sep 2011 08:41:36 +0200 From: Uwe Kleine-König <u.kleine-koenig@...gutronix.de> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Sascha Hauer <s.hauer@...gutronix.de>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Arnd Bergmann <arnd@...db.de> Subject: Re: linux-next: manual merge of the i.MX tree with the arm-soc tree Hello, On Fri, Sep 09, 2011 at 11:40:16AM +1000, Stephen Rothwell wrote: > The conflict looks like this: > > diff --cc arch/arm/mach-imx/Makefile > index f87cc55,d22096a..0000000 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@@ -3,7 -3,7 +3,11 @@@ obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1 > obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o > obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o > > ++<<<<<<< HEAD > +obj-$(CONFIG_SOC_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o > ++======= > + obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o > ++>>>>>>> i.MX/for-next > > obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o > obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o > > Given that there are no other references to SOC_MX25 in the resulting > tree, I used the latter version. That's right. Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists