linux-next: manual merge of the bkl-vfs tree with the usb tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the bkl-vfs tree got a conflict in
drivers/usb/gadget/inode.c between commit
e77e6e934520456e9e47f51847eb9dffa3dca9e5 ("usb gadget: don't save bind
callback in struct usb_gadget_driver") from the usb tree and commit
5cfc17f9036a43727c498ababa0ae79148bb4fb5 ("BKL: Explicitly add BKL around
get_sb/fill_super") from the bkl-vfs tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/gadget/inode.c
index e2e8eda,82a88d3..0000000
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@@ -2041,13 -2043,19 +2041,19 @@@ gadgetfs_fill_super (struct super_bloc
  	struct dentry	*d;
  	struct dev_data	*dev;
  
- 	if (the_device)
+ 	lock_kernel();
+ 
+ 	if (the_device) {
+ 		unlock_kernel();
  		return -ESRCH;
+ 	}
  
  	/* fake probe to determine $CHIP */
 -	(void) usb_gadget_register_driver (&probe_driver);
 +	(void) usb_gadget_probe_driver(&probe_driver, gadgetfs_probe);
- 	if (!CHIP)
+ 	if (!CHIP) {
+ 		unlock_kernel();
  		return -ENODEV;
+ 	}
  
  	/* superblock */
  	sb->s_blocksize = PAGE_CACHE_SIZE;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/