Merge commit 'bb2ee0f1750dbcbe76a5c74cd73e6281401d6212' into LINUX_3_10

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 9b809da2c299549c8830af6df1b202593eafc761..2b0f82db5682493080513837ec3d1fe6b473d89b 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -31,49 +31,42 @@ diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek
 index 7a0c800..ec5ebbb 100644
 --- a/drivers/net/ethernet/realtek/r8169.c
 +++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
-       /* Get MAC address */
+@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const
        for (i = 0; i < ETH_ALEN; i++)
                dev->dev_addr[i] = RTL_R8(MAC0 + i);
-+
+ 
 +      if (!is_valid_ether_addr(dev->dev_addr)) {
 +              /* Report it and use a random ethernet address instead */
 +              netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
 +              random_ether_addr(dev->dev_addr);
 +              netdev_info(dev, "Using random MAC address: %pM\n",
-+                          dev->dev_addr);
++                              dev->dev_addr);
 +      }
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- 
++
        SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
--- 
-1.7.7.3
+       dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
+ 
+[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
+
+If a device has the skip_vpd_pages flag set we should simply fail the
+scsi_get_vpd_page() call.
 
-  
---- linux-3.4/fs/unionfs/commonfops.c.org      2012-05-29 20:40:20.756489877 +0200
-+++ linux-3.4/fs/unionfs/commonfops.c  2012-05-29 21:07:12.021252743 +0200
-@@ -766,7 +766,7 @@
-                                  unsigned int cmd, unsigned long arg)
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Tested-by: Stuart Foster <smf.linux@ntlworld.com>
+Cc: stable@vger.kernel.org
+
+diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
+index 3b1ea34..eaa808e 100644
+--- a/drivers/scsi/scsi.c
++++ b/drivers/scsi/scsi.c
+@@ -1031,6 +1031,9 @@
  {
-       int err = 0;
--      fd_set branchlist;
-+      unsigned long branchlist = 0;
-       int bstart = 0, bend = 0, bindex = 0;
-       int orig_bstart, orig_bend;
-       struct dentry *dentry, *lower_dentry;
-@@ -781,14 +781,12 @@
-       bstart = dbstart(dentry);
-       bend = dbend(dentry);
+       int i, result;
  
--      FD_ZERO(&branchlist);
--
-       for (bindex = bstart; bindex <= bend; bindex++) {
-               lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
-               if (!lower_dentry)
-                       continue;
-               if (likely(lower_dentry->d_inode))
--                      FD_SET(bindex, &branchlist);
-+                      __set_bit(bindex, &branchlist);
-               /* purge any lower objects after partial_lookup */
-               if (bindex < orig_bstart || bindex > orig_bend) {
-                       dput(lower_dentry);
++      if (sdev->skip_vpd_pages)
++          goto fail;
++
+       /* Ask for all the pages supported by this device */
+       result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
+       if (result)