linux-kernel - Re: linux-next: manual merge of the mfd tree with Linus' 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: <20100913135915.GI2555@sortiz-mobl>
Date:	Mon, 13 Sep 2010 15:59:15 +0200
From:	Samuel Ortiz <sameo@...ux.intel.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arnd Hannemann <arnd@...dnet.de>,
	Paul Mundt <lethal@...ux-sh.org>
Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree

Hi Stephen,

On Mon, Sep 13, 2010 at 11:54:04AM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-shmobile/board-ap4evb.c between commit
> 410d878bd05315a19894b8b4685107f2cd0712a5 ("ARM: mach-shmobile: ap4evb:
> fix write protect for SDHI1") from Linus' tree and commit
> c3cfb4003377a3397b27de0efe910c9abd838ac3 ("ARM: mach-shmobile: ap4evb:
> Fix hotplug for SDHI1") from the mfd tree.
The conflict should be merged by now. Thanks for the warning.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.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/