From: Chris Ball <chris@printf.net>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc <linux-mmc@vger.kernel.org>
Subject: Re: [GIT PULL] MMC updates for mmc-next for 3.16, take 2
Date: Mon, 12 May 2014 23:23:19 +0100 [thread overview]
Message-ID: <861tvytz54.fsf@void.printf.net> (raw)
In-Reply-To: <CAPDyKFrCuL9HmQyOPZXex1WZT0LiJ6HCj6JiXoh-x+o-CHuhiA@mail.gmail.com> (Ulf Hansson's message of "Thu, 8 May 2014 14:57:07 +0200")
Hi Ulf,
On Thu, May 08 2014, Ulf Hansson wrote:
> Note 2)
> I have not included the patch below; since I think it would be better
> if you just drop the patch which this is reverting from your mmc next
> branch.
> [PATCH 1/2] mmc: rtsx: Revert "mmc: rtsx: modify error handle and
> remove smatch warnings"
Thanks for putting this together, I've dropped that patch and pulled
in your patchset to mmc-next now.
Something I'm curious about -- if I drop the above rtsx patch from
(what used to be) origin/mmc-next and then pull your branch, I get:
>From git://git.linaro.org/people/ulf.hansson/mmc
* branch mmc-next_for_chris_3.16_take2 -> FETCH_HEAD
Auto-merging drivers/mmc/host/rtsx_usb_sdmmc.c
CONFLICT (add/add): Merge conflict in drivers/mmc/host/rtsx_usb_sdmmc.c
Auto-merging drivers/mmc/host/mxcmmc.c
CONFLICT (content): Merge conflict in drivers/mmc/host/mxcmmc.c
Auto-merging drivers/mmc/host/Makefile
Auto-merging drivers/mmc/host/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
The conflict in rtsx_usb_sdmmc.c is understandable, but I wonder why
mxcmmc.c grew a conflict when it wasn't modified by the patch I
dropped? If you happen to know, would be great to understand it. :)
Thanks!
- Chris.
--
Chris Ball <http://printf.net/>
next prev parent reply other threads:[~2014-05-12 22:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-08 12:57 [GIT PULL] MMC updates for mmc-next for 3.16, take 2 Ulf Hansson
2014-05-12 22:23 ` Chris Ball [this message]
2014-05-13 8:54 ` Ulf Hansson
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=861tvytz54.fsf@void.printf.net \
--to=chris@printf.net \
--cc=linux-mmc@vger.kernel.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