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

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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140612071744.GA11421@lee--X1>
Date:	Thu, 12 Jun 2014 08:17:44 +0100
From:	Lee Jones <lee.jones@...aro.org>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Chris Ball <chris@...ntf.net>,
	Mike Turquette <mturquette@...aro.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	linux-mmc@...r.kernel.org
Subject: Re: [GIT PULL] MMC updates for 3.16-rc1

On Tue, 10 Jun 2014, Linus Torvalds wrote:

> On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball <chris@...ntf.net> 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 ("dmaengine: omap: hide filter_fn for built-in
> drivers").
> 
> 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 clock tree (sunxi) trees and
> now the MMC tree.
> 
> Don't you guys talk to each other? The Realtek driver is even marked
> as Acked-by Chris Ball in the MFD tree.

Yes, we do talk to each other.  Branch ib-mfd-mmc-memstick-3.16 was
created as a result.  Based on no facts at all, I'm guessing that the
shared (immutable) branch wasn't applied correctly in the MMC tree.

> 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.
> 
> Grr.
> 
> Anyway, pulled, merged correctly, and pushed out..
> 
>                 Linus

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
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/