linux-kernel - linux-next: manual merge of the imx-mxs tree with the pinctrl tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130405154203.4069187c95a65ab74a2590a0@canb.auug.org.au>
Date:	Fri, 5 Apr 2013 15:42:03 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shawn Guo <shawn.guo@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Haojian Zhuang <haojian.zhuang@...aro.org>,
	Linus Walleij <linus.walleij@...aro.org>
Subject: linux-next: manual merge of the imx-mxs tree with the pinctrl tree

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
drivers/pinctrl/Makefile between commit 62194200e5e3 ("pinctrl: remove
pxa pinctrl driver") from the pinctrl tree and commit b8979245b6ff
("pinctrl: add pinctrl driver for imx6dl") from the imx-mxs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/pinctrl/Makefile
index 82db76c,8bdaf23..0000000
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -21,7 -21,10 +21,8 @@@ obj-$(CONFIG_PINCTRL_IMX35)	+= pinctrl-
  obj-$(CONFIG_PINCTRL_IMX51)	+= pinctrl-imx51.o
  obj-$(CONFIG_PINCTRL_IMX53)	+= pinctrl-imx53.o
  obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6q.o
+ obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6dl.o
 -obj-$(CONFIG_PINCTRL_PXA3xx)	+= pinctrl-pxa3xx.o
  obj-$(CONFIG_PINCTRL_FALCON)	+= pinctrl-falcon.o
 -obj-$(CONFIG_PINCTRL_MMP2)	+= pinctrl-mmp2.o
  obj-$(CONFIG_PINCTRL_MXS)	+= pinctrl-mxs.o
  obj-$(CONFIG_PINCTRL_IMX23)	+= pinctrl-imx23.o
  obj-$(CONFIG_PINCTRL_IMX28)	+= pinctrl-imx28.o

Content of type "application/pgp-signature" skipped