diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 08:06:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 08:06:34 -0700 |
| commit | 9c4e8363c9705e92791b59557e4d86a407b16e7f (patch) | |
| tree | e4ea131fa4d7d736d20baa39949af4353d650d67 | |
| parent | 19f23bdac78b23931f45121dd246fedad57597b1 (diff) | |
| download | patches-9c4e8363c9705e92791b59557e4d86a407b16e7f.tar.gz | |
handle the initial .35 merge issues
this deletes a few patches, and fixes fuzz and conflicts on a
bunch of others.
16 files changed, 65 insertions, 200 deletions
diff --git a/driver-core/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch b/driver-core/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch index 996f66f5bc9080..9b9a0376c9fbfe 100644 --- a/driver-core/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch +++ b/driver-core/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch @@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c -@@ -2907,5 +2907,5 @@ EXPORT_SYMBOL(ppp_output_wakeup); +@@ -2926,5 +2926,5 @@ EXPORT_SYMBOL(ppp_output_wakeup); EXPORT_SYMBOL(ppp_register_compressor); EXPORT_SYMBOL(ppp_unregister_compressor); MODULE_LICENSE("GPL"); @@ -119,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +MODULE_ALIAS("devname:ppp"); --- a/drivers/net/tun.c +++ b/drivers/net/tun.c -@@ -1624,3 +1624,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); +@@ -1649,3 +1649,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_AUTHOR(DRV_COPYRIGHT); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(TUN_MINOR); diff --git a/driver-core/driver-core-early-dev_name-support.patch b/driver-core/driver-core-early-dev_name-support.patch deleted file mode 100644 index 134432e9795137..00000000000000 --- a/driver-core/driver-core-early-dev_name-support.patch +++ /dev/null @@ -1,81 +0,0 @@ -From lethal@linux-sh.org Tue Mar 16 13:29:36 2010 -From: Paul Mundt <lethal@linux-sh.org> -Date: Tue, 9 Mar 2010 15:57:53 +0900 -Subject: driver core: Early dev_name() support. -To: Greg KH <greg@kroah.com> -Cc: Magnus Damm <damm@opensource.se>, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org -Message-ID: <20100309065753.GA8287@linux-sh.org> -Content-Disposition: inline - - -Presently early platform devices suffer from the fact they are unable to -use dev_xxx() calls early on due to dev_name() and others being -unavailable at the time ->probe() is called. - -This implements early init_name construction from the matched name/id -pair following the semantics of the late device/driver match. As a -result, matched IDs (inclusive of requested ones) are preserved when the -handoff from the early platform code happens at kobject initialization -time. - -Since we still require kmalloc slabs to be available at this point, using -kstrdup() for establishing the init_name works fine. This subsequently -needs to be tested from dev_name() prior to the init_name being cleared -by the driver core. We don't kfree() since others will already have a -handle on the string long before the kobject initialization takes place. - -This is also needed to permit drivers to use the clock framework early, -without having to manually construct their own device IDs from the match -id/name pair locally (needed by the early console and timer code on sh -and arm). - -Signed-off-by: Paul Mundt <lethal@linux-sh.org> -Cc: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/platform.c | 19 +++++++++++++++++++ - include/linux/device.h | 4 ++++ - 2 files changed, 23 insertions(+) - ---- a/drivers/base/platform.c -+++ b/drivers/base/platform.c -@@ -1254,6 +1254,25 @@ static int __init early_platform_driver_ - } - - if (match) { -+ /* -+ * Set up a sensible init_name to enable -+ * dev_name() and others to be used before the -+ * rest of the driver core is initialized. -+ */ -+ if (!match->dev.init_name) { -+ char buf[32]; -+ -+ if (match->id != -1) -+ snprintf(buf, sizeof(buf), "%s.%d", -+ match->name, match->id); -+ else -+ snprintf(buf, sizeof(buf), "%s", -+ match->name); -+ -+ match->dev.init_name = kstrdup(buf, GFP_KERNEL); -+ if (!match->dev.init_name) -+ return -ENOMEM; -+ } - if (epdrv->pdrv->probe(match)) - pr_warning("%s: unable to probe %s early.\n", - class_str, match->name); ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -451,6 +451,10 @@ struct device { - - static inline const char *dev_name(const struct device *dev) - { -+ /* Use the init name until the kobject becomes available */ -+ if (dev->init_name) -+ return dev->init_name; -+ - return kobject_name(&dev->kobj); - } - diff --git a/driver-core/lockdep-add-novalidate-class-for-dev-mutex-conversion.patch b/driver-core/lockdep-add-novalidate-class-for-dev-mutex-conversion.patch index 1d38068de75e70..cf0812c6a708ef 100644 --- a/driver-core/lockdep-add-novalidate-class-for-dev-mutex-conversion.patch +++ b/driver-core/lockdep-add-novalidate-class-for-dev-mutex-conversion.patch @@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * case since the result is not well defined and the caller should rather --- a/kernel/lockdep.c +++ b/kernel/lockdep.c -@@ -2706,6 +2706,8 @@ void lockdep_init_map(struct lockdep_map +@@ -2711,6 +2711,8 @@ void lockdep_init_map(struct lockdep_map } EXPORT_SYMBOL_GPL(lockdep_init_map); @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * This gets called for every mutex_lock*()/spin_lock*() operation. * We maintain the dependency maps and validate the locking attempt: -@@ -2740,6 +2742,9 @@ static int __lock_acquire(struct lockdep +@@ -2745,6 +2747,9 @@ static int __lock_acquire(struct lockdep return 0; } diff --git a/driver-core/net-expose-all-network-devices-in-a-namespaces-in-sysfs.patch b/driver-core/net-expose-all-network-devices-in-a-namespaces-in-sysfs.patch index b962aecfe68bc3..e3ff8e6c583a75 100644 --- a/driver-core/net-expose-all-network-devices-in-a-namespaces-in-sysfs.patch +++ b/driver-core/net-expose-all-network-devices-in-a-namespaces-in-sysfs.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -984,15 +984,10 @@ int dev_change_name(struct net_device *d +@@ -1002,15 +1002,10 @@ int dev_change_name(struct net_device *d return err; rollback: @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } write_lock_bh(&dev_base_lock); -@@ -5112,8 +5107,6 @@ int register_netdevice(struct net_device +@@ -4994,8 +4989,6 @@ int register_netdevice(struct net_device if (dev->features & NETIF_F_SG) dev->features |= NETIF_F_GSO; @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); ret = notifier_to_errno(ret); if (ret) -@@ -5634,15 +5627,6 @@ int dev_change_net_namespace(struct net_ +@@ -5547,15 +5540,6 @@ int dev_change_net_namespace(struct net_ if (dev->features & NETIF_F_NETNS_LOCAL) goto out; @@ -92,16 +92,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Ensure the device has been registrered */ err = -EINVAL; if (dev->reg_state != NETREG_REGISTERED) -@@ -5693,8 +5677,6 @@ int dev_change_net_namespace(struct net_ - dev_unicast_flush(dev); - dev_addr_discard(dev); +@@ -5606,8 +5590,6 @@ int dev_change_net_namespace(struct net_ + dev_uc_flush(dev); + dev_mc_flush(dev); - netdev_unregister_kobject(dev); - /* Actually switch the network namespace */ dev_net_set(dev, net); -@@ -5707,7 +5689,7 @@ int dev_change_net_namespace(struct net_ +@@ -5620,7 +5602,7 @@ int dev_change_net_namespace(struct net_ } /* Fixup kobjects */ @@ -112,7 +112,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Add the device back in the hashes */ --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c -@@ -508,9 +508,6 @@ static int netdev_uevent(struct device * +@@ -808,9 +808,6 @@ static int netdev_uevent(struct device * struct net_device *dev = to_net_dev(d); int retval; @@ -122,35 +122,35 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* pass interface to uevent. */ retval = add_uevent_var(env, "INTERFACE=%s", dev->name); if (retval) -@@ -569,9 +566,6 @@ void netdev_unregister_kobject(struct ne +@@ -869,9 +866,6 @@ void netdev_unregister_kobject(struct ne kobject_get(&dev->kobj); - if (!net_eq(dev_net(net), &init_net)) - return; - - device_del(dev); - } - -@@ -581,6 +575,7 @@ int netdev_register_kobject(struct net_d - struct device *dev = &(net->dev); + #ifdef CONFIG_RPS + rx_queue_remove_kobjects(net); + #endif +@@ -886,6 +880,7 @@ int netdev_register_kobject(struct net_d const struct attribute_group **groups = net->sysfs_groups; + int error = 0; + device_initialize(dev); dev->class = &net_class; dev->platform_data = net; dev->groups = groups; -@@ -603,9 +598,6 @@ int netdev_register_kobject(struct net_d +@@ -908,9 +903,6 @@ int netdev_register_kobject(struct net_d #endif #endif /* CONFIG_SYSFS */ - if (!net_eq(dev_net(net), &init_net)) - return 0; - - return device_add(dev); - } - -@@ -622,12 +614,6 @@ void netdev_class_remove_file(struct cla + error = device_add(dev); + if (error) + return error; +@@ -939,12 +931,6 @@ void netdev_class_remove_file(struct cla EXPORT_SYMBOL(netdev_class_create_file); EXPORT_SYMBOL(netdev_class_remove_file); diff --git a/driver-core/net-sysfs-fix-the-bitrot-in-network-device-kobject-namespace-support.patch b/driver-core/net-sysfs-fix-the-bitrot-in-network-device-kobject-namespace-support.patch index eb4f7980fce135..725ae2255ec87a 100644 --- a/driver-core/net-sysfs-fix-the-bitrot-in-network-device-kobject-namespace-support.patch +++ b/driver-core/net-sysfs-fix-the-bitrot-in-network-device-kobject-namespace-support.patch @@ -57,15 +57,15 @@ Acked-by: David S. Miller <davem@davemloft.net> source "net/xfrm/Kconfig" --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c -@@ -468,6 +468,7 @@ static struct attribute_group wireless_g +@@ -469,6 +469,7 @@ static struct attribute_group wireless_g .attrs = wireless_attrs, }; #endif +#endif /* CONFIG_SYSFS */ - static const void *net_current_ns(void) - { -@@ -496,11 +497,10 @@ static void net_kobj_ns_exit(struct net + #ifdef CONFIG_RPS + /* +@@ -796,11 +797,10 @@ static void net_kobj_ns_exit(struct net kobj_ns_exit(KOBJ_NS_TYPE_NET, net); } @@ -78,7 +78,7 @@ Acked-by: David S. Miller <davem@davemloft.net> #ifdef CONFIG_HOTPLUG static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) -@@ -631,8 +631,6 @@ void netdev_initialize_kobject(struct ne +@@ -948,8 +948,6 @@ void netdev_initialize_kobject(struct ne int netdev_kobject_init(void) { kobj_ns_type_register(&net_ns_type_operations); diff --git a/driver-core/netns-teach-network-device-kobjects-which-namespace-they-are-in.patch b/driver-core/netns-teach-network-device-kobjects-which-namespace-they-are-in.patch index 7f03d756267bd7..638a7f486001a3 100644 --- a/driver-core/netns-teach-network-device-kobjects-which-namespace-they-are-in.patch +++ b/driver-core/netns-teach-network-device-kobjects-which-namespace-they-are-in.patch @@ -29,8 +29,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- include/linux/kobject.h | 1 + net/Kconfig | 8 ++++++++ - net/core/net-sysfs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 55 insertions(+) + net/core/net-sysfs.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 56 insertions(+) --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -70,11 +70,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#include <net/net_namespace.h> #include <linux/rtnetlink.h> #include <linux/wireless.h> - #include <net/wext.h> -@@ -467,6 +469,37 @@ static struct attribute_group wireless_g - }; - #endif - + #include <linux/vmalloc.h> +@@ -766,6 +768,38 @@ static void rx_queue_remove_kobjects(str + kset_unregister(net->queues_kset); + } + #endif /* CONFIG_RPS */ ++ +static const void *net_current_ns(void) +{ + return current->nsproxy->net_ns; @@ -109,7 +110,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* CONFIG_SYSFS */ #ifdef CONFIG_HOTPLUG -@@ -507,6 +540,13 @@ static void netdev_release(struct device +@@ -806,6 +840,13 @@ static void netdev_release(struct device kfree((char *)dev - dev->padded); } @@ -123,7 +124,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct class net_class = { .name = "net", .dev_release = netdev_release, -@@ -516,6 +556,8 @@ static struct class net_class = { +@@ -815,6 +856,8 @@ static struct class net_class = { #ifdef CONFIG_HOTPLUG .dev_uevent = netdev_uevent, #endif @@ -132,7 +133,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; /* Delete sysfs entries but hold kobject reference until after all -@@ -588,5 +630,9 @@ void netdev_initialize_kobject(struct ne +@@ -904,5 +947,9 @@ void netdev_initialize_kobject(struct ne int netdev_kobject_init(void) { diff --git a/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch b/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch index ef10809117ec13..cd21a2dd5f2261 100644 --- a/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch +++ b/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch @@ -424,7 +424,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct device *dev; --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c -@@ -85,7 +85,8 @@ exit: +@@ -81,7 +81,8 @@ exit: mutex_unlock(&data->update_lock); } @@ -447,7 +447,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c -@@ -2539,7 +2539,8 @@ netxen_sysfs_validate_crb(struct netxen_ +@@ -2560,7 +2560,8 @@ netxen_sysfs_validate_crb(struct netxen_ } static ssize_t @@ -457,7 +457,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> char *buf, loff_t offset, size_t size) { struct device *dev = container_of(kobj, struct device, kobj); -@@ -2557,7 +2558,8 @@ netxen_sysfs_read_crb(struct kobject *ko +@@ -2587,7 +2588,8 @@ netxen_sysfs_read_crb(struct kobject *ko } static ssize_t @@ -467,7 +467,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> char *buf, loff_t offset, size_t size) { struct device *dev = container_of(kobj, struct device, kobj); -@@ -2588,7 +2590,8 @@ netxen_sysfs_validate_mem(struct netxen_ +@@ -2627,7 +2629,8 @@ netxen_sysfs_validate_mem(struct netxen_ } static ssize_t @@ -477,7 +477,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> char *buf, loff_t offset, size_t size) { struct device *dev = container_of(kobj, struct device, kobj); -@@ -2608,7 +2611,7 @@ netxen_sysfs_read_mem(struct kobject *ko +@@ -2647,7 +2650,7 @@ netxen_sysfs_read_mem(struct kobject *ko return size; } @@ -488,7 +488,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c -@@ -2400,7 +2400,8 @@ qlcnic_sysfs_validate_crb(struct qlcnic_ +@@ -2464,7 +2464,8 @@ qlcnic_sysfs_validate_crb(struct qlcnic_ } static ssize_t @@ -498,7 +498,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> char *buf, loff_t offset, size_t size) { struct device *dev = container_of(kobj, struct device, kobj); -@@ -2418,7 +2419,8 @@ qlcnic_sysfs_read_crb(struct kobject *ko +@@ -2488,7 +2489,8 @@ qlcnic_sysfs_read_crb(struct kobject *ko } static ssize_t @@ -508,7 +508,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> char *buf, loff_t offset, size_t size) { struct device *dev = container_of(kobj, struct device, kobj); -@@ -2449,7 +2451,8 @@ qlcnic_sysfs_validate_mem(struct qlcnic_ +@@ -2525,7 +2527,8 @@ qlcnic_sysfs_validate_mem(struct qlcnic_ } static ssize_t @@ -518,7 +518,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> char *buf, loff_t offset, size_t size) { struct device *dev = container_of(kobj, struct device, kobj); -@@ -2470,7 +2473,8 @@ qlcnic_sysfs_read_mem(struct kobject *ko +@@ -2546,7 +2549,8 @@ qlcnic_sysfs_read_mem(struct kobject *ko } static ssize_t @@ -727,7 +727,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct pci_dev *pdev = to_pci_dev(container_of(kobj, struct device, kobj)); --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c -@@ -1634,7 +1634,7 @@ static ssize_t pccard_extract_cis(struct +@@ -1531,7 +1531,7 @@ static ssize_t pccard_extract_cis(struct } @@ -736,7 +736,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) { -@@ -1665,7 +1665,7 @@ static ssize_t pccard_show_cis(struct ko +@@ -1562,7 +1562,7 @@ static ssize_t pccard_show_cis(struct ko } @@ -1367,7 +1367,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct fb_info *fb_info = dev_get_drvdata(fbdev); --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c -@@ -646,7 +646,8 @@ const struct attribute_group *usb_device +@@ -658,7 +658,8 @@ const struct attribute_group *usb_device /* Binary descriptors */ static ssize_t @@ -1608,7 +1608,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> memcpy(buf, &__start_notes + off, count); --- a/kernel/module.c +++ b/kernel/module.c -@@ -1192,7 +1192,7 @@ struct module_notes_attrs { +@@ -1182,7 +1182,7 @@ struct module_notes_attrs { struct bin_attribute attrs[0]; }; @@ -36,7 +36,6 @@ driver-core/kref-remove-kref_set.patch driver-core/driver-core-reduce-the-level-of-request_firmware-messages.patch driver-core/driver-core-fix-potential-race-condition-in-drivers-base-dd.c.patch driver-core/driver-core-don-t-initialize-wakeup-flags.patch -driver-core/driver-core-early-dev_name-support.patch driver-core/driver-core-module.c-use-kasprintf.patch driver-core/devtmpfs-support-config_tmpfs.patch driver-core/platform_bus-allow-custom-extensions-to-system-pm-methods.patch @@ -99,7 +98,6 @@ tty/tty-n_gsm-depends-on-net.patch tty/serial-uartlite-move-from-byte-accesses-to-word-accesses.patch tty/serial-two-branches-the-same-in-timbuart_set_mctrl.patch tty/serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed.patch -tty/serial167-kill-unused-variables.patch tty/serial-add-driver-for-the-altera-jtag-uart.patch tty/serial-add-driver-for-the-altera-uart.patch tty/tty-fix-obsolete-comment-on-tty_insert_flip_string_fixed_flag.patch diff --git a/tty/serial-add-driver-for-the-altera-jtag-uart.patch b/tty/serial-add-driver-for-the-altera-jtag-uart.patch index 7f0e765d4e169e..8e4b2df39a9d0e 100644 --- a/tty/serial-add-driver-for-the-altera-jtag-uart.patch +++ b/tty/serial-add-driver-for-the-altera-jtag-uart.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1530,4 +1530,25 @@ config SERIAL_GRLIB_GAISLER_APBUART_CONS +@@ -1523,4 +1523,25 @@ config SERIAL_GRLIB_GAISLER_APBUART_CONS help Support for running a console on the GRLIB APBUART @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endmenu --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile -@@ -83,3 +83,4 @@ obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgd +@@ -82,3 +82,4 @@ obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgd obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o diff --git a/tty/serial-add-driver-for-the-altera-uart.patch b/tty/serial-add-driver-for-the-altera-uart.patch index fe318316e1f7e8..c0498e3e1ea0b5 100644 --- a/tty/serial-add-driver-for-the-altera-uart.patch +++ b/tty/serial-add-driver-for-the-altera-uart.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1551,4 +1551,35 @@ config SERIAL_ALTERA_JTAGUART_CONSOLE_BY +@@ -1544,4 +1544,35 @@ config SERIAL_ALTERA_JTAGUART_CONSOLE_BY Bypass console output and keep going even if there is no JTAG terminal connection with the host. @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endmenu --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile -@@ -84,3 +84,4 @@ obj-$(CONFIG_SERIAL_QE) += ucc_uart.o +@@ -83,3 +83,4 @@ obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o diff --git a/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch b/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch index 0ff1f293567ed5..d48a3b8891192a 100644 --- a/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch +++ b/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1450,24 +1450,48 @@ config SERIAL_BFIN_SPORT0_UART +@@ -1443,24 +1443,48 @@ config SERIAL_BFIN_SPORT0_UART help Enable UART over SPORT0 diff --git a/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch b/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch index dbf607148e73c0..ccd68704d9a533 100644 --- a/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch +++ b/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1446,7 +1446,7 @@ config SERIAL_BFIN_SPORT_CONSOLE +@@ -1439,7 +1439,7 @@ config SERIAL_BFIN_SPORT_CONSOLE config SERIAL_BFIN_SPORT0_UART bool "Enable UART over SPORT0" diff --git a/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch b/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch index c4214df95fe080..58bcaf145cd077 100644 --- a/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch +++ b/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1430,8 +1430,8 @@ config SERIAL_SC26XX_CONSOLE +@@ -1423,8 +1423,8 @@ config SERIAL_SC26XX_CONSOLE Support for Console on SC2681/SC2692 serial ports. config SERIAL_BFIN_SPORT diff --git a/tty/serial-tty-new-ldiscs-for-staging.patch b/tty/serial-tty-new-ldiscs-for-staging.patch index 3c6c2af982730e..721b039cd9bf09 100644 --- a/tty/serial-tty-new-ldiscs-for-staging.patch +++ b/tty/serial-tty-new-ldiscs-for-staging.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ #define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */ #define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */ --#define NR_LDISCS 20 +-#define NR_LDISCS 21 +#define NR_LDISCS 30 /* line disciplines */ diff --git a/tty/serial167-kill-unused-variables.patch b/tty/serial167-kill-unused-variables.patch deleted file mode 100644 index c30cc224382474..00000000000000 --- a/tty/serial167-kill-unused-variables.patch +++ /dev/null @@ -1,50 +0,0 @@ -From akpm@linux-foundation.org Tue May 4 13:04:49 2010 -From: Geert Uytterhoeven <geert@linux-m68k.org> -Date: Tue, 27 Apr 2010 14:16:40 -0700 -Subject: serial167: kill unused variables -To: greg@kroah.com -Cc: akpm@linux-foundation.org, geert@linux-m68k.org, alan@lxorguk.ukuu.org.uk -Message-ID: <201004272116.o3RLGexn020408@imap1.linux-foundation.org> - - -From: Geert Uytterhoeven <geert@linux-m68k.org> - -commits 638157bc1461f6718eeca06bedd9a09cf1f35c36 ("serial167: prepare to -push BKL down into drivers") and 4165fe4ef7305609a96c7f248cefb9c414d0ede5 -("tty: Fix up char drivers request_room usage") removed code without -removing the corresponding variables: - -| drivers/char/serial167.c: In function 'cd2401_rx_interrupt': -| drivers/char/serial167.c:630: warning: unused variable 'len' -| drivers/char/serial167.c: In function 'cy_ioctl': -| drivers/char/serial167.c:1531: warning: unused variable 'val' - -Remove the variables to kill the warnings. - -Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> -Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/serial167.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/drivers/char/serial167.c -+++ b/drivers/char/serial167.c -@@ -627,7 +627,6 @@ static irqreturn_t cd2401_rx_interrupt(i - char data; - int char_count; - int save_cnt; -- int len; - - /* determine the channel and change to that context */ - channel = (u_short) (base_addr[CyLICR] >> 2); -@@ -1528,7 +1527,6 @@ static int - cy_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) - { -- unsigned long val; - struct cyclades_port *info = tty->driver_data; - int ret_val = 0; - void __user *argp = (void __user *)arg; diff --git a/tty/tty-n_gsm-line-discipline.patch b/tty/tty-n_gsm-line-discipline.patch index a91bd12944b155..917bee1da1a342 100644 --- a/tty/tty-n_gsm-line-discipline.patch +++ b/tty/tty-n_gsm-line-discipline.patch @@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/char/Makefile | 1 drivers/char/n_gsm.c | 2763 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/gsmmux.h | 25 - include/linux/tty.h | 3 - 5 files changed, 2799 insertions(+), 2 deletions(-) + include/linux/tty.h | 1 + 5 files changed, 2798 insertions(+), 1 deletion(-) --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -2856,14 +2856,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif --- a/include/linux/tty.h +++ b/include/linux/tty.h -@@ -46,8 +46,9 @@ - #define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */ - #define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */ +@@ -48,6 +48,7 @@ #define N_PPS 18 /* Pulse per Second */ -- #define N_V253 19 /* Codec control over voice modem */ -+#define N_GSM0710 20 /* GSM 0710 Mux */ -+ + #define N_CAIF 20 /* CAIF protocol for talking to modems */ ++#define N_GSM0710 21 /* GSM 0710 Mux */ /* * This character is the same as _POSIX_VDISABLE: it cannot be used as |