linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20100526015436.GB8920@linux-sh.org>
Date:	Wed, 26 May 2010 10:54:36 +0900
From:	Paul Mundt <lethal@...ux-sh.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Magnus Damm <damm@...nsource.se>
Subject: Re: linux-next: manual merge of the genesis tree with the sh tree

On Wed, May 26, 2010 at 11:23:31AM +1000, Stephen Rothwell wrote:
> 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.
> 
Sorry about that, I needed the fix in the sh tree since the genesis tree
hadn't been merged yet, so the interdependencies have created a bit of a
mess.

> 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).

Sounds good, thanks!
--
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/