linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Haojian Zhuang <haojian.zhuang@linaro.org>,
	Linus Walleij <linus.walleij@linaro.org>
Subject: linux-next: manual merge of the imx-mxs tree with the pinctrl tree
Date: Fri, 5 Apr 2013 15:42:03 +1100	[thread overview]
Message-ID: <20130405154203.4069187c95a65ab74a2590a0@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]

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@canb.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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

                 reply	other threads:[~2013-04-05  4:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130405154203.4069187c95a65ab74a2590a0@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=haojian.zhuang@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=shawn.guo@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).