From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Weber <weber@corscience•de>,
Samuel Ortiz <samuel@sortiz•org>
Subject: linux-next: manual merge of the trivial tree with the net tree
Date: Tue, 12 Oct 2010 11:53:31 +1100 [thread overview]
Message-ID: <20101012115331.cc88eb1a.sfr@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
net/irda/irnet/irnet_ppp.c between commit
f8cba16cad68c9b9ee7fecae48a1b91708e8e482 ("irda: Remove BKL instances
from irnet") from the net tree and commit
b42e17963c20ecb80905083ceaecc79fd9bd30f1 ("Fix typo configue => configure
in comments") from the trivial 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 net/irda/irnet/irnet_ppp.c
index 0993bd4,36f43ca..0000000
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@@ -664,10 -663,8 +664,10 @@@ dev_irnet_ioctl
if((val == N_SYNC_PPP) || (val == N_PPP))
{
DEBUG(FS_INFO, "Entering PPP discipline.\n");
- /* PPP channel setup (ap->chan in configued in dev_irnet_open())*/
+ /* PPP channel setup (ap->chan in configured in dev_irnet_open())*/
- lock_kernel();
+ if (mutex_lock_interruptible(&ap->lock))
+ return -EINTR;
+
err = ppp_register_channel(&ap->chan);
if(err == 0)
{
next reply other threads:[~2010-10-12 0:53 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 0:53 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-07-22 4:18 linux-next: manual merge of the trivial tree with the net tree Stephen Rothwell
2011-07-22 6:42 ` Francois Romieu
2011-01-04 3:22 Stephen Rothwell
2011-01-05 14:51 ` Jiri Kosina
2011-01-05 15:22 ` Justin P. Mattock
2010-09-24 2:19 Stephen Rothwell
2010-09-24 12:09 ` Jiri Kosina
2010-02-24 5:21 Stephen Rothwell
2010-02-16 3:50 Stephen Rothwell
2010-02-05 2:37 Stephen Rothwell
2010-02-05 4:26 ` David Miller
2010-02-05 8:39 ` Jiri Kosina
2010-02-05 11:23 ` Jiri Kosina
2010-02-05 16:55 ` David Miller
2010-02-03 2:30 Stephen Rothwell
2010-02-03 10:39 ` Jiri Kosina
2010-02-04 4:04 ` David Miller
2010-02-04 9:52 ` Jiri Kosina
2010-02-04 12:50 ` Giuseppe CAVALLARO
2010-02-04 13:52 ` Giuseppe CAVALLARO
2010-02-04 17:33 ` David Miller
2009-11-30 2:53 Stephen Rothwell
2009-11-30 12:36 ` Jiri Kosina
2009-11-30 19:55 ` Stephen Rothwell
2009-11-24 6:14 Stephen Rothwell
2009-11-24 9:13 ` Jiri Kosina
2009-11-30 1:13 ` David Miller
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=20101012115331.cc88eb1a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=samuel@sortiz$(echo .)org \
--cc=weber@corscience$(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