From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chris Ball <chris@printf.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Micky Ching <micky_ching@realsil.com.cn>,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: Re: linux-next: manual merge of the mmc tree with Linus' tree
Date: Fri, 9 May 2014 08:14:23 +0100 [thread overview]
Message-ID: <20140509071423.GF5767@lee--X1> (raw)
In-Reply-To: <20140509134455.07d7de4d@canb.auug.org.au>
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
> the tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
> remove smatch warnings") from the mmc tree.
>
> I fixed it up (maybe - see below and in the final tree) and can carry
> the fix as necessary (no action is required).
FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
will continue to happen until a pending revert is merged.
--
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-05-09 7:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 3:44 linux-next: manual merge of the mmc tree with Linus' tree Stephen Rothwell
2014-05-09 7:14 ` Lee Jones [this message]
2014-05-09 7:41 ` Ulf Hansson
2014-05-12 0:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-01-13 2:17 Stephen Rothwell
2014-01-13 17:11 ` Sören Brinkmann
2011-08-11 3:55 Stephen Rothwell
2011-08-11 21:13 ` Chris Ball
2011-08-03 3:16 Stephen Rothwell
2011-06-01 1:13 Stephen Rothwell
2011-06-01 3:35 ` Shawn Guo
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=20140509071423.GF5767@lee--X1 \
--to=lee.jones@linaro.org \
--cc=chris@printf.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=micky_ching@realsil.com.cn \
--cc=sfr@canb.auug.org.au \
--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