3 files changed, 19 insertions, 144 deletions
diff --git a/driver-core.current/documentation-howto-update-git-home-url.patch b/driver-core.current/documentation-howto-update-git-home-url.patch
deleted file mode 100644
index 6b509f5e912cba..00000000000000
--- a/driver-core.current/documentation-howto-update-git-home-url.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From randy.dunlap@oracle.com  Wed Apr 14 11:28:46 2010
-From: Randy Dunlap <randy.dunlap@oracle.com>
-Date: Tue, 6 Apr 2010 16:16:59 -0700
-Subject: Documentation/HOWTO: update git home URL
-Cc: gregkh <greg@kroah.com>
-Message-ID: <20100406161659.c07638ad.randy.dunlap@oracle.com>
-
-
-From: Randy Dunlap <randy.dunlap@oracle.com>
-
-Update git home page info.
-
-Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- Documentation/HOWTO |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Documentation/HOWTO
-+++ b/Documentation/HOWTO
-@@ -234,7 +234,7 @@ process is as follows:
-     Linus, usually the patches that have already been included in the
-     -next kernel for a few weeks.  The preferred way to submit big changes
-     is using git (the kernel's source management tool, more information
--    can be found at http://git.or.cz/) but plain patches are also just
-+    can be found at http://git-scm.com/) but plain patches are also just
-     fine.
-   - After two weeks a -rc1 kernel is released it is now possible to push
-     only patches that do not include new features that could affect the
diff --git a/driver-core/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch b/driver-core.current/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
index 96906a3b170c10..5d8155fa7cd706 100644
--- a/driver-core/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
+++ b/driver-core.current/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
@@ -20,7 +20,7 @@ useless init scripts and modprobes from init scripts.
 
 The static device node aliases will be carried in the module itself. The
 program depmod will extract this information to a file in the module directory:
-  $ cat /lib/modules/2.6.34-00650-g537b60d-dirty/modules.devname 
+  $ cat /lib/modules/2.6.34-00650-g537b60d-dirty/modules.devname
   # Device nodes to trigger on-demand module loading.
   microcode cpu/microcode c10:184
   fuse fuse c10:229
@@ -68,26 +68,24 @@ Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- Documentation/devices.txt        |    3 +++
+ Documentation/devices.txt        |    2 ++
  arch/x86/kernel/microcode_core.c |    1 +
- drivers/md/dm-ioctl.c            |    5 ++++-
  drivers/net/ppp_generic.c        |    4 ++--
  drivers/net/tun.c                |    1 +
  fs/autofs4/dev-ioctl.c           |    5 ++++-
  fs/btrfs/super.c                 |    5 ++++-
  fs/fuse/dev.c                    |    1 +
- include/linux/miscdevice.h       |    3 +++
- 9 files changed, 23 insertions(+), 5 deletions(-)
+ include/linux/miscdevice.h       |    2 ++
+ 8 files changed, 17 insertions(+), 4 deletions(-)
 
 --- a/Documentation/devices.txt
 +++ b/Documentation/devices.txt
-@@ -443,6 +443,9 @@ Your cooperation is appreciated.
+@@ -443,6 +443,8 @@ Your cooperation is appreciated.
  		231 = /dev/snapshot	System memory snapshot device
  		232 = /dev/kvm		Kernel-based virtual machine (hardware virtualization extensions)
  		233 = /dev/kmview	View-OS A process with a view
 +		234 = /dev/btrfs-control	Btrfs control device
-+		235 = /dev/mapper/control	Device-Mapper control device
-+		236 = /dev/autofs	Autofs control device
++		235 = /dev/autofs	Autofs control device
  		240-254			Reserved for local use
  		255			Reserved for MISC_DYNAMIC_MINOR
  
@@ -101,25 +99,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #else
  #define microcode_dev_init()	0
  #define microcode_dev_exit()	do { } while (0)
---- a/drivers/md/dm-ioctl.c
-+++ b/drivers/md/dm-ioctl.c
-@@ -1599,12 +1599,15 @@ static const struct file_operations _ctl
- };
- 
- static struct miscdevice _dm_misc = {
--	.minor 		= MISC_DYNAMIC_MINOR,
-+	.minor 		= MAPPER_CTRL_MINOR,
- 	.name  		= DM_NAME,
- 	.nodename	= "mapper/control",
- 	.fops  		= &_ctl_fops
- };
- 
-+MODULE_ALIAS_MISCDEV(MAPPER_CTRL_MINOR);
-+MODULE_ALIAS("devname:mapper/control");
-+
- /*
-  * Create misc character device and link to DM_DIR/control.
-  */
 --- a/drivers/net/ppp_generic.c
 +++ b/drivers/net/ppp_generic.c
 @@ -2926,5 +2926,5 @@ EXPORT_SYMBOL(ppp_output_wakeup);
@@ -185,13 +164,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- a/include/linux/miscdevice.h
 +++ b/include/linux/miscdevice.h
-@@ -31,6 +31,9 @@
+@@ -31,6 +31,8 @@
  #define FUSE_MINOR		229
  #define KVM_MINOR		232
  #define VHOST_NET_MINOR		233
 +#define BTRFS_MINOR		234
-+#define MAPPER_CTRL_MINOR	235
-+#define AUTOFS_MINOR		236
++#define AUTOFS_MINOR		235
  #define MISC_DYNAMIC_MINOR	255
  
  struct device;
diff --git a/series b/series
index 046b2d266fd6b2..85c66d7aa8d7c8 100644
--- a/series
+++ b/series
@@ -2,117 +2,44 @@
 gregkh/gkh-version.patch
 
 #####################################################################
-# Stuff to be merged for 2.6.34
+# Stuff to be merged for 2.6.35
 #####################################################################
 
 #################################
-# Driver core patches for 2.6.34
+# Driver core patches for 2.6.35
 #################################
-#driver-core.current/drivers-base-cpu.c-fix-the-output-from-sys-devices-system-cpu-offline.patch
-#driver-core.current/firmware_class-fix-memory-leak-free-allocated-pages.patch
+driver-core.current/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
 
 #################################
-# TTY patches for 2.6.34
+# TTY patches for 2.6.35
 #################################
 
-
 #################################
-# USB patches for 2.6.34
+# USB patches for 2.6.35
 #################################
 
 #################################
-# Staging patches for 2.6.34
+# Staging patches for 2.6.35
 #################################
 
 
 #####################################################################
-# Stuff to be merged after 2.6.34 is out
+# Stuff to be merged after 2.6.35 is out
 #####################################################################
 
 #############################################
-# Driver core patches for after 2.6.34 is out
+# Driver core patches for after 2.6.35 is out
 #############################################
-#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-module.c-use-kasprintf.patch
-#driver-core/devtmpfs-support-config_tmpfs.patch
-#driver-core/platform_bus-allow-custom-extensions-to-system-pm-methods.patch
-
-## will we make it this time???
-#driver-core/drivers-base-convert-sema.patch
-#driver-core/lockdep-add-novalidate-class-for-dev-mutex-conversion.patch
-
-#driver-core/firmware-class-export-nowait-to-userspace.patch
-#driver-core/firmware-loader-rely-on-driver-core-to-create-class-attribute.patch
-#driver-core/firmware-loader-split-out-builtin-firmware-handling.patch
-#driver-core/firmware-loader-do-not-allocate-firmare-id-separately.patch
-#driver-core/driver-core-protect-device-shutdown-from-hot-unplug-events.patch
-#driver-core/generate-change-uevent-for-loop-device.patch
 
-#driver-core/sysfs-basic-support-for-multiple-super-blocks.patch
-#driver-core/sysfs-remove-double-free-sysfs_get_sb.patch
-#driver-core/kobj-add-basic-infrastructure-for-dealing-with-namespaces.patch
-#driver-core/sysfs-implement-sysfs-tagged-directory-support.patch
-#driver-core/sysfs-add-support-for-tagged-directories-with-untagged-members.patch
-#driver-core/sysfs-implement-sysfs_delete_link.patch
-#driver-core/driver-core-implement-ns-directory-support-for-device-classes.patch
-#driver-core/sysfs-comment-sysfs-directory-tagging-logic.patch
-#driver-core/sysfs-namespaces-add-a-high-level-documentation-file.patch
-#driver-core/sysfs-don-t-use-enums-in-inline-function-declaration.patch
-#driver-core/sysfs-remove-usage-of-s_bias-to-avoid-merge-conflict-with-the-vfs-tree.patch
-
-#driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch
-#driver-core/pci-check-caps-from-sysfs-file-open-to-read-device-dependent-config-space.patch
-#driver-core/driver-core-fix-typo-in-drivers-base-core.c-for-config_module.patch
-driver-core/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
-
-#driver-core/kobject-send-hotplug-events-in-all-network-namespaces.patch
-#driver-core/netns-teach-network-device-kobjects-which-namespace-they-are-in.patch
-#driver-core/net-sysfs-fix-the-bitrot-in-network-device-kobject-namespace-support.patch
-#driver-core/netlink-implment-netlink_broadcast_filtered.patch
-#driver-core/kobj-send-hotplug-events-in-the-proper-namespace.patch
-#driver-core/hotplug-netns-aware-uevent_helper.patch
-#driver-core/net-expose-all-network-devices-in-a-namespaces-in-sysfs.patch
 
 #####################################
-# TTY patches for after 2.6.34 is out
+# TTY patches for after 2.6.35 is out
 #####################################
-#tty/serial-bfin_sport_uart-work-around-anomaly-05000473-make-32bit-fifo-read-atomic.patch
-#tty/serial-bfin_sport_uart-shorten-the-sport-tx-waiting-loop.patch
-#tty/serial-bfin_sport_uart-remove-unused-peripheral-pin-lists.patch
-#tty/serial-bfin_sport_uart-add-missing-mapbase-initialization.patch
-#tty/serial-bfin_sport_uart-rename-early-platform-driver-class-string.patch
-#tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch
-#tty/serial-bfin_sport_uart-protect-changes-to-uart_port.patch
-#tty/serial-bfin_sport_uart-zero-sport_uart_port-if-allocated-dynamically.patch
-#tty/serial-bfin_sport_uart-drop-useless-status-masks.patch
-#tty/serial-bfin_sport_uart-only-enable-sport-tx-if-data-is-to-be-sent.patch
-#tty/serial-bfin_sport_uart-pull-in-bfin_sport.h-for-sport-defines.patch
-#tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch
-#tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch
-#tty/serial-tty-new-ldiscs-for-staging.patch
-#tty/tty-n_gsm-line-discipline.patch
-#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/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
-#tty/serial-bfin_sport_uart-use-resource-size-to-fix-off-by-one-error.patch
-#tty/serial-isicomm-handle-running-out-of-slots.patch
-#tty/serial-tidy-remote_debug.patch
-
 
 ###################################
-# USB stuff for after 2.6.34 is out
+# USB stuff for after 2.6.35 is out
 ###################################
 
-#######################################
-# Staging stuff for after 2.6.34 is out
-#######################################
-# new stuff is in the staging-next git tree on git.kernel.org
+# staging stuff is now in the staging-next tree on git.kernel.org