public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Chris Ball <chris@printf.net>
To: Lee Jones <lee.jones@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Mike Turquette <mturquette@linaro.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-mmc@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>
Subject: Re: [GIT PULL] MMC updates for 3.16-rc1
Date: Thu, 12 Jun 2014 13:19:00 +0100	[thread overview]
Message-ID: <86lht2mibv.fsf@void.printf.net> (raw)
In-Reply-To: <20140612071744.GA11421@lee--X1> (Lee Jones's message of "Thu, 12 Jun 2014 08:17:44 +0100")

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 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.

Yes, our fault -- I gave my Ack, but then Ulf sent me the driver in his
PR and I pulled it.  Sorry for all the trouble, it was the first cycle
with Ulf and I co-maintaining, and a larger set of commits than usual.
We'll make sure to do better.

Thanks,

- Chris.
-- 
Chris Ball   <http://printf.net/>

      reply	other threads:[~2014-06-12 12:19 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
2014-06-12 12:19     ` Chris Ball [this message]

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=86lht2mibv.fsf@void.printf.net \
    --to=chris@printf.net \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=mturquette@linaro.org \
    --cc=torvalds@linux-foundation.org \
    --cc=ulf.hansson@linaro.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