linux-kernel - linux-next: manual merge of the moduleh tree with the 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 1 Aug 2011 13:09:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus Walleij <linus.walleij@...aro.org>,
	Vinod Koul <vinod.koul@...el.com>
Subject: linux-next: manual merge of the moduleh tree with the  tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/dma/ste_dma40.c between commit f4b89764c470
("dmaengine/ste_dma40: use AMBA PrimeCell helper macros") from the
slave-dma tree and commit dbd9b79ce7bd ("Add export.h
to /home/paul/git/module.h/linux-2.6.git/drivers/dma/ste_dma40.c") from
the moduleh tree.

Just a trivla context change.  I fixed it up (just overlapping include
additions) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped