From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King - ARM Linux Subject: Re: [PATCH v2 00/24] MMC/SDHCI fixes Date: Tue, 22 Dec 2015 11:40:03 +0000 Message-ID: <20151222114003.GC8644@n2100.arm.linux.org.uk> References: <20151221113956.GA3712@n2100.arm.linux.org.uk> <20151221125120.GZ8644@n2100.arm.linux.org.uk> <20151221134138.GB8644@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from pandora.arm.linux.org.uk ([78.32.30.218]:42262 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754907AbbLVLkV (ORCPT ); Tue, 22 Dec 2015 06:40:21 -0500 Content-Disposition: inline In-Reply-To: Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Ulf Hansson Cc: Gregory CLEMENT , linux-mmc , Marcin Wojtas , Shawn Guo , Sascha Hauer On Tue, Dec 22, 2015 at 12:25:53PM +0100, Ulf Hansson wrote: > Huh. The merge ends up in a quite complicated conflict to resolve for > me. And I am running out of time. Sorry, I'm out of time too - I've still a number of things to do commercially, I have to get several pull requests out that I've promised to get out a few weeks back, and I still need to sort out some remaining ARM patches in the patch system - some of which have been sent by people too eager, so need cross-referencing with what's been discussed on the mailing lists. Today is likely to be the last day I do anything time-consuming on the kernel before Christmas, so I'm afraid a rebase will have to wait until the new year. -- RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.