linux-kernel - linux-next: manual merge of the async

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]

Date:	Fri, 27 May 2011 13:30:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dan Williams <dan.j.williams@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jean Delvare <khali@...ux-fr.org>,
	Havard Skinnemoen <hskinnemoen@...il.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Viresh Kumar <viresh.kumar@...com>
Subject: linux-next: manual merge of the async_tx tree with Linus' tree

Hi Dan,

Today's linux-next merge of the async_tx tree got a conflict in
drivers/dma/dw_dmac.c between commit e05503ef1186 ("Haavard Skinnemoen
has left Atmel") from Linus' tree and commit aecb7b64dd9e
("dmaengine/dw_dmac: Update maintainer-ship") from the async_tx tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/dma/dw_dmac.c
index 2a2e2fa,efd836d..0000000
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@@ -1486,4 -1575,5 +1575,5 @@@ module_exit(dw_exit)
  
  MODULE_LICENSE("GPL v2");
  MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
 -MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@...el.com>");
 +MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
+ MODULE_AUTHOR("Viresh Kumar <viresh.kumar@...com>");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/