From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Guennadi Liakhovetski <g.liakhovetski@gmx•de>,
Chris Ball <cjb@laptop•org>
Subject: Re: linux-next: manual merge of the pm tree with the mmc tree
Date: Mon, 19 Mar 2012 12:43:37 +0100 [thread overview]
Message-ID: <201203191243.37383.rjw@sisk.pl> (raw)
In-Reply-To: <20120319143335.8b31091f03de60e41987efde@canb.auug.org.au>
On Monday, March 19, 2012, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/mmc/host/tmio_mmc_pio.c between commit 4d741159c282 ("mmc:
> tmio_mmc: support the generic MMC GPIO card hotplug helper") from the mmc
> tree and commit c419e611c3c5 ("tmio_mmc / PM: Use PM QoS latency
> constraint") from the pm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Please do, thanks a lot!
Rafael
prev parent reply other threads:[~2012-03-19 11:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 3:33 linux-next: manual merge of the pm tree with the mmc tree Stephen Rothwell
2012-03-19 11:43 ` Rafael J. Wysocki [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=201203191243.37383.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=cjb@laptop$(echo .)org \
--cc=g.liakhovetski@gmx$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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