linux-kernel - linux-next: manual merge of the mmc tree with Linus' 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-next>] [day] [month] [year] [list]

Message-Id: <20140113131700.840c214536826d7e9a92ef8b@canb.auug.org.au>
Date:	Mon, 13 Jan 2014 13:17:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Ball <chris@...ntf.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Soren Brinkmann <soren.brinkmann@...inx.com>,
	Michal Simek <michal.simek@...inx.com>
Subject: linux-next: manual merge of the mmc tree with Linus' tree

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
driver for Arasan SDHCI") from the mmc 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 MAINTAINERS
index 64b39e610589,518bf717b02b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1387,9 -1371,7 +1387,10 @@@ T:	git git://git.xilinx.com/linux-xlnx.
  S:	Supported
  F:	arch/arm/mach-zynq/
  F:	drivers/cpuidle/cpuidle-zynq.c
 +N:	zynq
 +N:	xilinx
 +F:	drivers/clocksource/cadence_ttc_timer.c
+ F:	drivers/mmc/host/sdhci-of-arasan.c
  
  ARM SMMU DRIVER
  M:	Will Deacon <will.deacon@....com>


Content of type "application/pgp-signature" skipped