linux-kernel - linux-next: manual merge of the genesis tree with the sh 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: <20100526112331.cbd37c4b.sfr@canb.auug.org.au>
Date:	Wed, 26 May 2010 11:23:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Mundt <lethal@...ux-sh.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Magnus Damm <damm@...nsource.se>
Subject: linux-next: manual merge of the genesis tree with the sh tree

Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
include/linux/serial_sci.h between commit
14baf9d7f275f0bbf42c1216ff1eef1109ca42ba ("serial: sh-sci: fix up serial
DMA build") from the sh tree and commit
927a7c9c1793def3a55d60c926d3945528e6bf1b ("dmaengine: shdma: Enable on
SH-Mobile ARM") from the genesis tree.

I used the version from the sh tree (i.e. no "#ifdef
CONFIG_SERIAL_SH_SCI_DMA" around the include of linux/sh_dma.h).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped