Re: [GIT PULL] MMC updates for 3.16-rc1

2014-06-12 Thread Chris Ball
Hi, On Thu, Jun 12 2014, Lee Jones wrote: >> And I'm not sure why the sunxi driver (by David Lanzendörfer) and the >> Realtek driver (by Roger Tseng) got merged in two different trees. >> It's clearly the same patches and drivers, but I got them first >> through the MFD tree (Realtek) and the cloc

Re: [GIT PULL] MMC updates for 3.16-rc1

2014-06-12 Thread Lee Jones
On Tue, 10 Jun 2014, Linus Torvalds wrote: > On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball wrote: > > > > These patches have been tested in > > linux-next, and there are three minor conflicts which I've resolved on > > my mmc-updates-for-3.16-rc1-merged branch. > > Your merged branch is incorrec

Re: [GIT PULL] MMC updates for 3.16-rc1

2014-06-11 Thread Ulf Hansson
On 12 June 2014 07:25, Guennadi Liakhovetski wrote: > Hi Linus, > > On Wed, 11 Jun 2014, Linus Torvalds wrote: > >> On Tue, Jun 10, 2014 at 2:50 PM, Linus Torvalds >> wrote: >> > >> > Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking >> > noisy compile, and knisr certainly has ne

Re: [GIT PULL] MMC updates for 3.16-rc1

2014-06-11 Thread Guennadi Liakhovetski
Hi Linus, On Wed, 11 Jun 2014, Linus Torvalds wrote: > On Tue, Jun 10, 2014 at 2:50 PM, Linus Torvalds > wrote: > > > > Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking > > noisy compile, and knisr certainly has never been tested in a 64-bit > > environment. Please either fix i

Re: [GIT PULL] MMC updates for 3.16-rc1

2014-06-11 Thread Linus Torvalds
On Tue, Jun 10, 2014 at 2:50 PM, Linus Torvalds wrote: > > Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking > noisy compile, and knisr certainly has never been tested in a 64-bit > environment. Please either fix it, or make it depend on BROKEN. Guys? Seriously, if that driver is

Re: [GIT PULL] MMC updates for 3.16-rc1

2014-06-10 Thread Mike Turquette
Quoting Linus Torvalds (2014-06-10 14:50:59) > On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball wrote: > > > > These patches have been tested in > > linux-next, and there are three minor conflicts which I've resolved on > > my mmc-updates-for-3.16-rc1-merged branch. > > Your merged branch is incorre

Re: [GIT PULL] MMC updates for 3.16-rc1

2014-06-10 Thread Linus Torvalds
On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball wrote: > > These patches have been tested in > linux-next, and there are three minor conflicts which I've resolved on > my mmc-updates-for-3.16-rc1-merged branch. Your merged branch is incorrect as far as I can tell, and dropped commit a8246fedacad ("

[GIT PULL] MMC updates for 3.16-rc1

2014-06-10 Thread Chris Ball
Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-updates-for-3.16-rc1 to receive the MMC merge for 3.16. These patches have been tested in linux-next, and there are three minor conflicts which I've resolved on my mmc-updates-for-3.16-rc1-merged b