Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 45 insertions, 45 deletions

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 9c4422ac9de4..078daa026718 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -49,7 +49,7 @@
 #include <asm/unaligned.h>
 
 #include <linux/usb_ch9.h>
-#include <linux/usb_cdc.h>
+#include <linux/usb/cdc.h>
 #include <linux/usb_gadget.h>
 
 #include <linux/random.h>
@@ -101,9 +101,9 @@ static const char driver_desc [] = DRIVER_DESC;
 
 /* CDC and RNDIS support the same host-chosen outgoing packet filters. */
 #define DEFAULT_FILTER  (USB_CDC_PACKET_TYPE_BROADCAST \
-                        |USB_CDC_PACKET_TYPE_ALL_MULTICAST \
-                        |USB_CDC_PACKET_TYPE_PROMISCUOUS \
-                        |USB_CDC_PACKET_TYPE_DIRECTED)
+                        |USB_CDC_PACKET_TYPE_ALL_MULTICAST \
+                        |USB_CDC_PACKET_TYPE_PROMISCUOUS \
+                        |USB_CDC_PACKET_TYPE_DIRECTED)
 
 
 /*-------------------------------------------------------------------------*/
@@ -318,7 +318,7 @@ static inline int rndis_active(struct eth_dev *dev)
 #define DEFAULT_QLEN    2       /* double buffering by default */
 
 /* peak bulk transfer bits-per-second */
-#define HS_BPS          (13 * 512 * 8 * 1000 * 8)
+#define HS_BPS          (13 * 512 * 8 * 1000 * 8)
 #define FS_BPS          (19 *  64 * 1 * 1000 * 8)
 
 #ifdef CONFIG_USB_GADGET_DUALSPEED
@@ -466,7 +466,7 @@ eth_config = {
 };
 
 #ifdef  CONFIG_USB_ETH_RNDIS
-static struct usb_config_descriptor 
+static struct usb_config_descriptor
 rndis_config = {
         .bLength =              sizeof rndis_config,
         .bDescriptorType =      USB_DT_CONFIG,
@@ -511,7 +511,7 @@ static const struct usb_interface_descriptor
 rndis_control_intf = {
         .bLength =              sizeof rndis_control_intf,
         .bDescriptorType =      USB_DT_INTERFACE,
-          
+
         .bInterfaceNumber =     0,
         .bNumEndpoints =        1,
         .bInterfaceClass =      USB_CLASS_COMM,
@@ -545,20 +545,20 @@ static const struct usb_cdc_union_desc union_desc = {
 #ifdef  CONFIG_USB_ETH_RNDIS
 
 static const struct usb_cdc_call_mgmt_descriptor call_mgmt_descriptor = {
-        .bLength =              sizeof call_mgmt_descriptor,
-        .bDescriptorType =      USB_DT_CS_INTERFACE,
-        .bDescriptorSubType =   USB_CDC_CALL_MANAGEMENT_TYPE,
+        .bLength =              sizeof call_mgmt_descriptor,
+        .bDescriptorType =      USB_DT_CS_INTERFACE,
+        .bDescriptorSubType =   USB_CDC_CALL_MANAGEMENT_TYPE,
 
-        .bmCapabilities =       0x00,
-        .bDataInterface =       0x01,
+        .bmCapabilities =       0x00,
+        .bDataInterface =       0x01,
 };
 
 static const struct usb_cdc_acm_descriptor acm_descriptor = {
-        .bLength =              sizeof acm_descriptor,
-        .bDescriptorType =      USB_DT_CS_INTERFACE,
-        .bDescriptorSubType =   USB_CDC_ACM_TYPE,
+        .bLength =              sizeof acm_descriptor,
+        .bDescriptorType =      USB_DT_CS_INTERFACE,
+        .bDescriptorSubType =   USB_CDC_ACM_TYPE,
 
-        .bmCapabilities =       0x00,
+        .bmCapabilities =       0x00,
 };
 
 #endif
@@ -595,7 +595,7 @@ static const struct usb_cdc_ether_desc ether_desc = {
  * RNDIS requires the status endpoint, since it uses that encapsulation
  * mechanism for its funky RPC scheme.
  */
- 
+
 #define LOG2_STATUS_INTERVAL_MSEC       5       /* 1 << 5 == 32 msec */
 #define STATUS_BYTECOUNT                16      /* 8 byte header + data */
 
@@ -978,7 +978,7 @@ set_ether_config (struct eth_dev *dev, gfp_t gfp_flags)
 
                 result = usb_ep_enable (dev->status_ep, dev->status);
                 if (result != 0) {
-                        DEBUG (dev, "enable %s --> %d\n", 
+                        DEBUG (dev, "enable %s --> %d\n",
                                 dev->status_ep->name, result);
                         goto done;
                 }
@@ -1002,15 +1002,15 @@ set_ether_config (struct eth_dev *dev, gfp_t gfp_flags)
         if (!cdc_active(dev)) {
                 result = usb_ep_enable (dev->in_ep, dev->in);
                 if (result != 0) {
-                        DEBUG(dev, "enable %s --> %d\n", 
+                        DEBUG(dev, "enable %s --> %d\n",
                                 dev->in_ep->name, result);
                         goto done;
                 }
 
                 result = usb_ep_enable (dev->out_ep, dev->out);
                 if (result != 0) {
-                        DEBUG (dev, "enable %s --> %d\n", 
-                                dev->in_ep->name, result);
+                        DEBUG (dev, "enable %s --> %d\n",
+                                dev->out_ep->name, result);
                         goto done;
                 }
         }
@@ -1144,7 +1144,7 @@ eth_set_config (struct eth_dev *dev, unsigned number, gfp_t gfp_flags)
 #ifdef CONFIG_USB_GADGET_DUALSPEED
                 case USB_SPEED_HIGH:    speed = "high"; break;
 #endif
-                default:                speed = "?"; break;
+                default:                speed = "?"; break;
                 }
 
                 dev->config = number;
@@ -1206,7 +1206,7 @@ static void issue_start_status (struct eth_dev *dev)
         struct usb_request              *req = dev->stat_req;
         struct usb_cdc_notification     *event;
         int                             value;
- 
+
         DEBUG (dev, "%s, flush old status first\n", __FUNCTION__);
 
         /* flush old status
@@ -1268,7 +1268,7 @@ static void rndis_command_complete (struct usb_ep *ep, struct usb_request *req)
 {
         struct eth_dev          *dev = ep->driver_data;
         int                     status;
-        
+
         /* received RNDIS command from USB_CDC_SEND_ENCAPSULATED_COMMAND */
         spin_lock(&dev->lock);
         status = rndis_msg_parser (dev->rndis_config, (u8 *) req->buf);
@@ -1472,7 +1472,7 @@ done_set_intf:
 
 #endif /* DEV_CONFIG_CDC */
 
-#ifdef CONFIG_USB_ETH_RNDIS             
+#ifdef CONFIG_USB_ETH_RNDIS
         /* RNDIS uses the CDC command encapsulation mechanism to implement
          * an RPC scheme, with much getting/setting of attributes by OID.
          */
@@ -1489,7 +1489,7 @@ done_set_intf:
                 req->complete = rndis_command_complete;
                 /* later, rndis_control_ack () sends a notification */
                 break;
-                
+
         case USB_CDC_GET_ENCAPSULATED_RESPONSE:
                 if ((USB_DIR_IN|USB_TYPE_CLASS|USB_RECIP_INTERFACE)
                                         == ctrl->bRequestType
@@ -1641,7 +1641,7 @@ rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
                 DEBUG (dev, "no rx skb\n");
                 goto enomem;
         }
-        
+
         /* Some platforms perform better when IP packets are aligned,
          * but on at least one, checksumming fails otherwise.  Note:
          * RNDIS headers involve variable numbers of LE32 values.
@@ -1720,7 +1720,7 @@ quiesce:
         case -EOVERFLOW:
                 dev->stats.rx_over_errors++;
                 // FALLTHROUGH
-            
+
         default:
                 dev->stats.rx_errors++;
                 DEBUG (dev, "rx status %d\n", status);
@@ -1915,7 +1915,7 @@ static int eth_start_xmit (struct sk_buff *skb, struct net_device *net)
                                 sizeof (struct rndis_packet_msg_type));
                 if (!skb_rndis)
                         goto drop;
-        
+
                 dev_kfree_skb_any (skb);
                 skb = skb_rndis;
                 rndis_add_hdr (skb);
@@ -2001,7 +2001,7 @@ static int rndis_control_ack (struct net_device *net)
         struct eth_dev          *dev = netdev_priv(net);
         u32                     length;
         struct usb_request      *resp = dev->stat_req;
-        
+
         /* in case RNDIS calls this after disconnect */
         if (!dev->status) {
                 DEBUG (dev, "status ENODEV\n");
@@ -2021,16 +2021,16 @@ static int rndis_control_ack (struct net_device *net)
         resp->length = 8;
         resp->complete = rndis_control_ack_complete;
         resp->context = dev;
-        
+
         *((__le32 *) resp->buf) = __constant_cpu_to_le32 (1);
         *((__le32 *) resp->buf + 1) = __constant_cpu_to_le32 (0);
-        
+
         length = usb_ep_queue (dev->status_ep, resp, GFP_ATOMIC);
         if (length < 0) {
                 resp->status = 0;
                 rndis_control_ack_complete (dev->status_ep, resp);
         }
-        
+
         return 0;
 }
 
@@ -2047,7 +2047,7 @@ static void eth_start (struct eth_dev *dev, gfp_t gfp_flags)
         /* fill the rx queue */
         rx_fill (dev, gfp_flags);
 
-        /* and open the tx floodgates */ 
+        /* and open the tx floodgates */
         atomic_set (&dev->tx_qlen, 0);
         netif_wake_queue (dev->net);
         if (rndis_active(dev)) {
@@ -2076,7 +2076,7 @@ static int eth_stop (struct net_device *net)
         netif_stop_queue (net);
 
         DEBUG (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld\n",
-                dev->stats.rx_packets, dev->stats.tx_packets, 
+                dev->stats.rx_packets, dev->stats.tx_packets,
                 dev->stats.rx_errors, dev->stats.tx_errors
                 );
 
@@ -2095,7 +2095,7 @@ static int eth_stop (struct net_device *net)
                         usb_ep_enable (dev->status_ep, dev->status);
                 }
         }
-        
+
         if (rndis_active(dev)) {
                 rndis_set_param_medium (dev->rndis_config,
                                         NDIS_MEDIUM_802_3, 0);
@@ -2301,7 +2301,7 @@ autoconf_fail:
                 return -ENODEV;
         }
         in_ep->driver_data = in_ep;     /* claim */
-        
+
         out_ep = usb_ep_autoconfig (gadget, &fs_sink_desc);
         if (!out_ep)
                 goto autoconf_fail;
@@ -2374,8 +2374,8 @@ autoconf_fail:
 #endif
         }
 
-        net = alloc_etherdev (sizeof *dev);
-        if (!net)
+        net = alloc_etherdev (sizeof *dev);
+        if (!net)
                 return status;
         dev = netdev_priv(net);
         spin_lock_init (&dev->lock);
@@ -2454,7 +2454,7 @@ autoconf_fail:
         dev->gadget = gadget;
         set_gadget_data (gadget, dev);
         gadget->ep0->driver_data = dev;
-        
+
         /* two kinds of host-initiated state changes:
          *  - iff DATA transfer is active, carrier is "on"
          *  - tx queueing enabled if open *and* carrier is "on"
@@ -2462,8 +2462,8 @@ autoconf_fail:
         netif_stop_queue (dev->net);
         netif_carrier_off (dev->net);
 
-        SET_NETDEV_DEV (dev->net, &gadget->dev);
-        status = register_netdev (dev->net);
+        SET_NETDEV_DEV (dev->net, &gadget->dev);
+        status = register_netdev (dev->net);
         if (status < 0)
                 goto fail1;
 
@@ -2488,7 +2488,7 @@ autoconf_fail:
                 u32     vendorID = 0;
 
                 /* FIXME RNDIS vendor id == "vendor NIC code" == ? */
-                
+
                 dev->rndis_config = rndis_register (rndis_control_ack);
                 if (dev->rndis_config < 0) {
 fail0:
@@ -2496,7 +2496,7 @@ fail0:
                         status = -ENODEV;
                         goto fail;
                 }
-                
+
                 /* these set up a lot of the OIDs that RNDIS needs */
                 rndis_set_host_mac (dev->rndis_config, dev->host_mac);
                 if (rndis_set_param_dev (dev->rndis_config, dev->net,
@@ -2556,7 +2556,7 @@ static struct usb_gadget_driver eth_driver = {
         .suspend        = eth_suspend,
         .resume         = eth_resume,
 
-        .driver         = {
+        .driver = {
                 .name           = (char *) shortname,
                 .owner          = THIS_MODULE,
         },