linux-kernel - linux-next: manual merge of the tty tree with the slave-dma 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: <20150407192808.375a5d91@canb.auug.org.au>
Date:	Tue, 7 Apr 2015 19:28:08 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Vinod Koul <vinod.koul@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Xuelin Shi <xuelin.shi@...escale.com>
Subject: linux-next: manual merge of the tty tree with the slave-dma tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/dma/Kconfig between commit ad80da658bbc ("dmaengine: Driver
support for FSL RaidEngine device") from the slave-dma tree and commit
2b49e0c56741 ("dmaengine: append hsu DMA driver") from the tty 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/dma/Kconfig
index 38ece743f61d,074ffad334a7..000000000000
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -112,17 -125,8 +112,19 @@@ config FSL_DM
  	  EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on
  	  some Txxx and Bxxx parts.
  
 +config FSL_RAID
 +        tristate "Freescale RAID engine Support"
 +        depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
 +        select DMA_ENGINE
 +        select DMA_ENGINE_RAID
 +        ---help---
 +          Enable support for Freescale RAID Engine. RAID Engine is
 +          available on some QorIQ SoCs (like P5020/P5040). It has
 +          the capability to offload memcpy, xor and pq computation
 +	  for raid5/6.
 +
+ source "drivers/dma/hsu/Kconfig"
+ 
  config MPC512X_DMA
  	tristate "Freescale MPC512x built-in DMA engine support"
  	depends on PPC_MPC512x || PPC_MPC831x

Content of type "application/pgp-signature" skipped