linux-kernel - Re: linux-next: build failure after merge of the mmc 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20140106182939.32468378e51c5ab1b45e90bd@canb.auug.org.au>
Date:	Mon, 6 Jan 2014 18:29:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shawn Guo <shawn.guo@...aro.org>
Cc:	Dong Aisheng <dongas86@...il.com>, Chris Ball <cjb@...top.org>,
	<linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Dong Aisheng <b29396@...escale.com>
Subject: Re: linux-next: build failure after merge of the mmc tree

Hi Shawn,

On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <shawn.guo@...aro.org> wrote:
>
> Okay, I missed your point.  The resolution needs the additional changes
> as below.
> 
> Shawn
> 
> diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> index 91e5dd4..8b05648 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -356,6 +356,10 @@
>                 pinctrl_usdhc3: usdhc3grp {
>                         fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
>                 };
> +
> +               pinctrl_usdhc4: usdhc4grp {
> +                       fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
> +               };
>         };
>  };

Thanks, I will add this as a merge resolution patch tomorrow.

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

Content of type "application/pgp-signature" skipped