Subject: linux-next: manual merge of the trivial tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 12 Oct 2010 11:53:31 +1100

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                    [email-masked]

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)
  	    {