aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-16 22:37:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-16 22:37:10 -0700
commit210d894ff19726f6463e0fc1afbb3f6662d18e33 (patch)
tree2a4842e20c1ec73d777a232cef6c2f8d03063a89
parentf9168bc128d94166d042a2e6514287b1ace399f2 (diff)
downloadpatches-210d894ff19726f6463e0fc1afbb3f6662d18e33.tar.gz
patch refreshes for newer kernel
Diffstat
-rw-r--r--d01.patch20
-rw-r--r--p22.patch2
-rw-r--r--p29.patch4
-rw-r--r--qlcnic_sysfs.patch6
-rw-r--r--series1
-rw-r--r--simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch16
-rw-r--r--staging-exfat-add-filesystem-to-the-build.patch12
7 files changed, 31 insertions, 30 deletions
diff --git a/d01.patch b/d01.patch
index e6b386ac0dc096..5ba0a410a05afd 100644
--- a/d01.patch
+++ b/d01.patch
@@ -11,7 +11,7 @@
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
-@@ -1902,7 +1902,7 @@ struct hid_dynid {
+@@ -1946,7 +1946,7 @@ struct hid_dynid {
* Adds a new dynamic hid device ID to this driver,
* and causes the driver to probe for all devices again.
*/
@@ -20,7 +20,7 @@
size_t count)
{
struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);
-@@ -1934,7 +1934,13 @@ static ssize_t store_new_id(struct devic
+@@ -1978,7 +1978,13 @@ static ssize_t store_new_id(struct devic
return ret ? : count;
}
@@ -35,7 +35,7 @@
static void hid_free_dynids(struct hid_driver *hdrv)
{
-@@ -2094,6 +2100,7 @@ static int hid_uevent(struct device *dev
+@@ -2138,6 +2144,7 @@ static int hid_uevent(struct device *dev
static struct bus_type hid_bus_type = {
.name = "hid",
.dev_groups = hid_dev_groups,
@@ -43,7 +43,7 @@
.match = hid_bus_match,
.probe = hid_device_probe,
.remove = hid_device_remove,
-@@ -2532,8 +2539,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device);
+@@ -2585,8 +2592,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device);
int __hid_register_driver(struct hid_driver *hdrv, struct module *owner,
const char *mod_name)
{
@@ -52,7 +52,7 @@
hdrv->driver.name = hdrv->name;
hdrv->driver.bus = &hid_bus_type;
hdrv->driver.owner = owner;
-@@ -2542,21 +2547,12 @@ int __hid_register_driver(struct hid_dri
+@@ -2595,21 +2600,12 @@ int __hid_register_driver(struct hid_dri
INIT_LIST_HEAD(&hdrv->dyn_list);
spin_lock_init(&hdrv->dyn_lock);
@@ -354,7 +354,7 @@
{
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
-@@ -5373,50 +5373,43 @@ static struct pci_driver megasas_pci_dri
+@@ -5905,50 +5905,43 @@ static struct pci_driver megasas_pci_dri
/*
* Sysfs driver attributes
*/
@@ -416,7 +416,7 @@
{
int retval = count;
if(sscanf(buf,"%u",&megasas_dbg_lvl)<1){
-@@ -5426,8 +5419,7 @@ megasas_sysfs_set_dbg_lvl(struct device_
+@@ -5958,8 +5951,7 @@ megasas_sysfs_set_dbg_lvl(struct device_
return retval;
}
@@ -470,7 +470,7 @@
},
};
-@@ -4301,14 +4300,8 @@ static int __init init_st(void)
+@@ -4308,14 +4307,8 @@ static int __init init_st(void)
if (err)
goto err_chrdev;
@@ -485,7 +485,7 @@
err_chrdev:
unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
ST_MAX_TAPE_ENTRIES);
-@@ -4319,7 +4312,6 @@ err_class:
+@@ -4326,7 +4319,6 @@ err_class:
static void __exit exit_st(void)
{
@@ -493,7 +493,7 @@
scsi_unregister_driver(&st_template.gendrv);
unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
ST_MAX_TAPE_ENTRIES);
-@@ -4332,68 +4324,38 @@ module_exit(exit_st);
+@@ -4339,68 +4331,38 @@ module_exit(exit_st);
/* The sysfs driver interface. Read-only at the moment */
diff --git a/p22.patch b/p22.patch
index 6481df14114e42..2ac2bbd80f0bf9 100644
--- a/p22.patch
+++ b/p22.patch
@@ -36,7 +36,7 @@
};
+ATTRIBUTE_GROUPS(amba_dev);
- #ifdef CONFIG_PM_RUNTIME
+ #ifdef CONFIG_PM
/*
@@ -136,7 +134,7 @@ static const struct dev_pm_ops amba_pm =
*/
diff --git a/p29.patch b/p29.patch
index a3e479668f2522..01c6a81e00d07f 100644
--- a/p29.patch
+++ b/p29.patch
@@ -77,7 +77,7 @@
vio_bus_type.bus_groups = vio_bus_groups;
}
#else /* CONFIG_PPC_SMLPAR */
-@@ -1561,12 +1568,13 @@ static ssize_t modalias_show(struct devi
+@@ -1562,12 +1569,13 @@ static ssize_t modalias_show(struct devi
return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp);
}
@@ -96,7 +96,7 @@
void vio_unregister_device(struct vio_dev *viodev)
{
-@@ -1602,7 +1610,7 @@ static int vio_hotplug(struct device *de
+@@ -1603,7 +1611,7 @@ static int vio_hotplug(struct device *de
struct bus_type vio_bus_type = {
.name = "vio",
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch
index b28737f731c978..f83705f15fd035 100644
--- a/qlcnic_sysfs.patch
+++ b/qlcnic_sysfs.patch
@@ -91,7 +91,7 @@
static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj,
struct bin_attribute *attr, char *buf,
-@@ -1187,24 +1188,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w
+@@ -1162,24 +1163,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w
return size;
}
@@ -116,7 +116,7 @@
static struct bin_attribute bin_attr_crb = {
.attr = {.name = "crb", .mode = (S_IRUGO | S_IWUSR)},
.size = 0,
-@@ -1268,6 +1251,24 @@ static struct bin_attribute bin_attr_fla
+@@ -1243,6 +1226,24 @@ static struct bin_attribute bin_attr_fla
.write = qlcnic_83xx_sysfs_flash_write_handler,
};
@@ -141,7 +141,7 @@
void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter)
{
struct device *dev = &adapter->pdev->dev;
-@@ -1281,6 +1282,11 @@ void qlcnic_create_sysfs_entries(struct
+@@ -1256,6 +1257,11 @@ void qlcnic_create_sysfs_entries(struct
void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter)
{
struct device *dev = &adapter->pdev->dev;
diff --git a/series b/series
index 408dc2227277ad..8b3ff452f522aa 100644
--- a/series
+++ b/series
@@ -1,3 +1,4 @@
+csdio2.patch
input-xpad-use-proper-endpoint-type.patch
input-xpad-set-the-leds-properly-on-xbox-wireless-controllers.patch
#defer-input-nodes-and-led-support
diff --git a/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch b/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch
index d9eb686afe021e..db250d6a471def 100644
--- a/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch
+++ b/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch
@@ -59,9 +59,9 @@ Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
static unsigned int (*atkbd_platform_scancode_fixup)(struct atkbd *, unsigned int);
+static unsigned int (*atkbd_fake_fn_fixup)(struct atkbd *, unsigned int);
- static ssize_t atkbd_attr_show_helper(struct device *dev, char *buf,
- ssize_t (*handler)(struct atkbd *, char *));
-@@ -398,6 +413,13 @@ static irqreturn_t atkbd_interrupt(struc
+ /*
+ * Certain keyboards to not like ATKBD_CMD_RESET_DIS and stop responding
+@@ -404,6 +419,13 @@ static irqreturn_t atkbd_interrupt(struc
if (!atkbd->enabled)
goto out;
@@ -75,7 +75,7 @@ Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
input_event(dev, EV_MSC, MSC_RAW, code);
if (atkbd_platform_scancode_fixup)
-@@ -988,6 +1010,48 @@ static unsigned int atkbd_oqo_01plus_sca
+@@ -995,6 +1017,48 @@ static unsigned int atkbd_oqo_01plus_sca
}
/*
@@ -124,7 +124,7 @@ Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
* atkbd_set_keycode_table() initializes keyboard's keycode table
* according to the selected scancode set
*/
-@@ -1638,6 +1702,13 @@ static int __init atkbd_setup_scancode_f
+@@ -1651,6 +1715,13 @@ static int __init atkbd_deactivate_fixup
return 1;
}
@@ -138,9 +138,9 @@ Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = {
{
.matches = {
-@@ -1775,6 +1846,15 @@ static const struct dmi_system_id atkbd_
- .callback = atkbd_setup_scancode_fixup,
- .driver_data = atkbd_oqo_01plus_scancode_fixup,
+@@ -1802,6 +1873,15 @@ static const struct dmi_system_id atkbd_
+ },
+ .callback = atkbd_deactivate_fixup,
},
+ {
+ /* Google Chromebook Pixel */
diff --git a/staging-exfat-add-filesystem-to-the-build.patch b/staging-exfat-add-filesystem-to-the-build.patch
index 2f6984987dc252..aa584004021991 100644
--- a/staging-exfat-add-filesystem-to-the-build.patch
+++ b/staging-exfat-add-filesystem-to-the-build.patch
@@ -18,19 +18,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
-@@ -146,4 +146,6 @@ source "drivers/staging/dgnc/Kconfig"
+@@ -146,4 +146,6 @@ source "drivers/staging/nokia_h4p/Kconfi
- source "drivers/staging/dgap/Kconfig"
+ source "drivers/staging/unisys/Kconfig"
+source "drivers/staging/exfat/Kconfig"
+
endif # STAGING
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
-@@ -65,3 +65,4 @@ obj-$(CONFIG_XILLYBUS) += xillybus/
- obj-$(CONFIG_DGNC) += dgnc/
- obj-$(CONFIG_DGAP) += dgap/
- obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f_spinand/
+@@ -65,3 +65,4 @@ obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f
+ obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/
+ obj-$(CONFIG_BT_NOKIA_H4P) += nokia_h4p/
+ obj-$(CONFIG_UNISYSSPAR) += unisys/
+obj-$(CONFIG_EXFAT_FS) += exfat/
--- /dev/null
+++ b/drivers/staging/exfat/Kconfig
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 12:32:07 +0000