linux-kernel - linux-next: manual merge of the spi 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: <20150319144834.56c676f6@canb.auug.org.au>
Date:	Thu, 19 Mar 2015 14:48:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nel.org>, Vinod Koul <vinod.koul@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Jarkko Nikula <jarkko.nikula@...ux.intel.com>
Subject: linux-next: manual merge of the spi tree with the slave-dma tree

Hi Mark,

Today's linux-next merge of the spi tree got conflicts in
drivers/dma/intel_mid_dma_regs.h and drivers/dma/intel_mid_dma.c
between commit 3b62286d0ef7 ("dmaengine: Remove FSF mailing addresses")
from the slave-dma tree and commit 36111da7838e ("dmaengine:
intel-mid-dma: remove the driver") from the spi tree.

I fixed it up (I just removed the files) and can carry the fix as
necessary (no action is required).

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

Content of type "application/pgp-signature" skipped