From: Lee Jones <lee.jones@linaro.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Chris Ball <chris@printf.net>,
Mike Turquette <mturquette@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-mmc@vger.kernel.org
Subject: Re: [GIT PULL] MMC updates for 3.16-rc1
Date: Thu, 12 Jun 2014 08:17:44 +0100 [thread overview]
Message-ID: <20140612071744.GA11421@lee--X1> (raw)
In-Reply-To: <CA+55aFxBwteZeUHG+Z-cdLU_YCO4f8TDuYvGmXc0-v9M1H11+g@mail.gmail.com>
On Tue, 10 Jun 2014, Linus Torvalds wrote:
> On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball <chris@printf.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
next prev parent reply other threads:[~2014-06-12 7:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-10 19:51 [GIT PULL] MMC updates for 3.16-rc1 Chris Ball
2014-06-10 21:50 ` Linus Torvalds
2014-06-10 23:47 ` Mike Turquette
2014-06-12 4:27 ` Linus Torvalds
2014-06-12 5:25 ` Guennadi Liakhovetski
2014-06-12 6:41 ` Ulf Hansson
2014-06-12 7:17 ` Lee Jones [this message]
2014-06-12 12:19 ` Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140612071744.GA11421@lee--X1 \
--to=lee.jones@linaro.org \
--cc=chris@printf.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox