From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dominik Brodowski <linux@dominikbrodowski•net>,
Thomas Gleixner <tglx@linutronix•de>
Subject: linux-next: manual merge of the driver-core tree with the pcmcia tree
Date: Tue, 2 Feb 2010 17:01:59 +1100 [thread overview]
Message-ID: <20100202170159.168a28e2.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/pcmcia/ds.c between commit
933a838aa1aae8388438bb002fbdaf6fca519a5c ("pcmcia: make use of
pcmcia_dev_resume() return value") from the pcmcia tree and commit
df5a0aec4591ae8a5deb67bc8cb6be3d0812abb2 ("drivers/base: Convert dev->sem
to mutex") from the driver-core tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/pcmcia/ds.c
index 76a2163,263bdc8..0000000
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@@ -999,10 -974,9 +999,10 @@@ static int runtime_resume(struct devic
{
int rc;
- down(&dev->sem);
+ mutex_lock(&dev->mutex);
rc = pcmcia_dev_resume(dev);
- up(&dev->sem);
+ mutex_unlock(&dev->mutex);
+ return rc;
}
/************************ per-device sysfs output ***************************/
next reply other threads:[~2010-02-02 6:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-02 6:01 Stephen Rothwell [this message]
2010-02-02 15:22 ` linux-next: manual merge of the driver-core tree with the pcmcia tree Greg KH
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=20100202170159.168a28e2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@dominikbrodowski$(echo .)net \
--cc=tglx@linutronix$(echo .)de \
/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