---- linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c 2006-03-05 19:07:54.000000000 +0000
-+++ linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c 2006-04-29 23:17:59.000000000 +0000
-@@ -175,6 +175,12 @@
- .id = SERIO_ANY,
- .extra = SERIO_ANY,
- },
-+ {
-+ .type = SERIO_RS232,
-+ .proto = 0x1f, // Trust ForceFeedback Race Master
-+ .id = SERIO_ANY,
-+ .extra = SERIO_ANY,
-+ },
- { 0 }
- };
-
---- linux-2.6.27/arch/powerpc/include/asm/io.h~ 2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.27/arch/powerpc/include/asm/io.h 2006-06-22 02:44:19.000000000 +0000
-@@ -445,6 +445,10 @@
- #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
- #define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET)
-
-+#define isa_virt_to_bus virt_to_phys
-+#define isa_page_to_bus page_to_phys
-+#define isa_bus_to_virt phys_to_virt
-+
- /* Enforce in-order execution of data I/O.
- * No distinction between read/write on PPC; use eieio for all three.
- */
---- linux-2.6.20/drivers/media/common/ir-keymaps.c.orig 2007-02-04 19:44:54.000000000 +0100
-+++ linux-2.6.20/drivers/media/common/ir-keymaps.c 2007-02-17 22:22:39.327414970 +0100
-@@ -151,10 +151,6 @@
-
- IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
-
-- [ 0x1e ] = KEY_POWER, // power
-- [ 0x07 ] = KEY_MEDIA, // source
-- [ 0x1c ] = KEY_SEARCH, // scan
--
- /* FIXME: duplicate keycodes?
- *
- * These four keys seem to share the same GPIO as CH+, CH-, <<< and >>>
-@@ -175,14 +171,10 @@
- */
-
- [ 0x03 ] = KEY_TUNER, // TV/FM
-+ [ 0x07 ] = KEY_SEARCH, // scan
-+ [ 0x1c ] = KEY_ZOOM, // zoom
-
-- [ 0x00 ] = KEY_RECORD,
-- [ 0x08 ] = KEY_STOP,
-- [ 0x11 ] = KEY_PLAY,
--
-- [ 0x1a ] = KEY_PLAYPAUSE, // freeze
-- [ 0x19 ] = KEY_ZOOM, // zoom
-- [ 0x0f ] = KEY_TEXT, // min
-+ [ 0x1e ] = KEY_POWER, // power
-
- [ 0x01 ] = KEY_1,
- [ 0x0b ] = KEY_2,
-@@ -195,20 +187,22 @@
- [ 0x12 ] = KEY_9,
- [ 0x02 ] = KEY_0,
- [ 0x10 ] = KEY_LAST, // +100
-- [ 0x13 ] = KEY_LIST, // recall
-+ [ 0x13 ] = KEY_LIST, // loop
-
-- [ 0x1f ] = KEY_CHANNELUP, // chn down
-- [ 0x17 ] = KEY_CHANNELDOWN, // chn up
-- [ 0x16 ] = KEY_VOLUMEUP, // vol down
-- [ 0x14 ] = KEY_VOLUMEDOWN, // vol up
-+ [ 0x1f ] = KEY_VOLUMEUP, // vol down
-+ [ 0x17 ] = KEY_VOLUMEDOWN, // vol up
-+ [ 0x16 ] = KEY_CHANNELUP, // chn down
-+ [ 0x14 ] = KEY_CHANNELDOWN, // chn up
-
-- [ 0x04 ] = KEY_KPMINUS, // <<<
-+ [ 0x00 ] = KEY_MEDIA, // source
-+ [ 0x18 ] = KEY_MUTE, // mute/unmute
+--- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100
+@@ -15,7 +15,8 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include "modpost.h"
+-#include "../../include/generated/autoconf.h"
++// PLD architectures don't use CONFIG_SYMBOL_PREFIX
++//#include "../../include/generated/autoconf.h"
+ #include "../../include/linux/license.h"
+
+ /* Some toolchains use a `_' prefix for all user symbols. */
+
+--- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200
++++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200
+@@ -9,6 +9,12 @@
+ $cc -print-file-name=lib${lib}.${ext} | grep -q /
+ if [ $? -eq 0 ]; then
+ echo "-l${lib}"
++ for libt in tinfow tinfo ; do
++ $cc -print-file-name=lib${libt}.${ext} | grep -q /
++ if [ $? -eq 0 ]; then
++ echo "-l${libt}"
++ fi
++ done
+ exit
+ fi
+ done
+
+diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
+index 7a0c800..ec5ebbb 100644
+--- a/drivers/net/ethernet/realtek/r8169.c
++++ b/drivers/net/ethernet/realtek/r8169.c
+@@ -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);
++ }
+
-+ [ 0x04 ] = KEY_KPMINUS, // -
- [ 0x0e ] = KEY_SETUP, // function
-- [ 0x0c ] = KEY_KPPLUS, // >>>
-+ [ 0x0c ] = KEY_KPPLUS, // +
-
-- [ 0x0d ] = KEY_GOTO, // mts
-- [ 0x1d ] = KEY_REFRESH, // reset
-- [ 0x18 ] = KEY_MUTE // mute/unmute
-+ [ 0x0d ] = KEY_REFRESH, // reset
-+ [ 0x0f ] = KEY_PLAYPAUSE // freeze
- };
-
- EXPORT_SYMBOL_GPL(ir_codes_pixelview);
---- linux-2.6.27/arch/powerpc/include/asm/suspend.h 2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.27/arch/powerpc/include/asm/suspend.h 2007-08-28 23:26:16.629658848 +0200
-@@ -6,4 +6,7 @@
- void save_processor_state(void);
- void restore_processor_state(void);
-
-+#define suspend2_faulted (0)
-+#define clear_suspend2_fault() do { } while(0)
-+
- #endif /* __ASM_POWERPC_SUSPEND_H */
---- linux-2.6.26/arch/powerpc/kernel/swsusp.c 2008-09-29 00:01:56.000000000 +0200
-+++ linux-2.6.26/arch/powerpc/kernel/swsusp.c 2008-09-29 00:01:42.000000000 +0200
-@@ -9,6 +9,7 @@
- * 2 of the License, or (at your option) any later version.
- */
-
-+#include <linux/module.h>
- #include <linux/sched.h>
- #include <asm/suspend.h>
- #include <asm/system.h>
-@@ -30,6 +31,7 @@
- #endif
-
- }
-+EXPORT_SYMBOL(save_processor_state);
-
- void restore_processor_state(void)
+ SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
+ 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.
+
+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 @@
{
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2588,18 +2588,15 @@ static int process_backlog(struct napi_s
- local_irq_disable();
- skb = __skb_dequeue(&queue->input_pkt_queue);
- if (!skb) {
-+ __napi_complete(napi);
- local_irq_enable();
-- napi_complete(napi);
-- goto out;
-+ break;
- }
- local_irq_enable();
-
-- napi_gro_receive(napi, skb);
-+ netif_receive_skb(skb);
- } while (++work < quota && jiffies == start_time);
-
-- napi_gro_flush(napi);
--
--out:
- return work;
- }
+ int i, result;
++ 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)
projects / packages / kernel.git / blobdiff