diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-10 10:11:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-10 10:11:13 -0700 |
| commit | 8f617b3f134ec98ff82ddabbb7cbb57e3df5adbf (patch) | |
| tree | 177c26a93b7b0fb5f8b347ad156d9001dd061bf0 | |
| parent | 3543e24d0544794768dc532bd23dab5c7015ab83 (diff) | |
| download | patches-8f617b3f134ec98ff82ddabbb7cbb57e3df5adbf.tar.gz | |
2.6.34-rc7
5 files changed, 8 insertions, 7 deletions
diff --git a/driver-core/sysfs-implement-sysfs-tagged-directory-support.patch b/driver-core/sysfs-implement-sysfs-tagged-directory-support.patch index fac740e3898310..7876855de11b47 100644 --- a/driver-core/sysfs-implement-sysfs-tagged-directory-support.patch +++ b/driver-core/sysfs-implement-sysfs-tagged-directory-support.patch @@ -123,7 +123,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> list_add_rcu(&rdev->same_set, &mddev->disks); bd_claim_by_disk(rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk); -@@ -4183,7 +4183,7 @@ static int md_alloc(dev_t dev, char *nam +@@ -4189,7 +4189,7 @@ static int md_alloc(dev_t dev, char *nam mutex_unlock(&disks_mutex); if (!error) { kobject_uevent(&mddev->kobj, KOBJ_ADD); @@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } mddev_put(mddev); return error; -@@ -4392,7 +4392,7 @@ static int do_md_run(mddev_t * mddev) +@@ -4398,7 +4398,7 @@ static int do_md_run(mddev_t * mddev) printk(KERN_WARNING "md: cannot register extra attributes for %s\n", mdname(mddev)); diff --git a/tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch b/tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch index 9c63caaca82713..0125446314e1c0 100644 --- a/tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch +++ b/tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch @@ -14,7 +14,8 @@ on ppc32 machines while booting. Fix this bug now. Reported-by: Leonardo Chiquitto <leonardo.lists@gmail.com> Tested-by: Leonardo Chiquitto <leonardo.lists@gmail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de> -Cc: stble <stable@kernel.org> +Cc: stable <stable@kernel.org> +Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch b/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch index 168423e5e82e74..fbe314be5869a1 100644 --- a/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch +++ b/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch @@ -253,7 +253,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/input/misc/ati_remote.c +++ b/drivers/input/misc/ati_remote.c -@@ -620,13 +620,13 @@ static void ati_remote_irq_in(struct urb +@@ -624,13 +624,13 @@ static void ati_remote_irq_in(struct urb static int ati_remote_alloc_buffers(struct usb_device *udev, struct ati_remote *ati_remote) { @@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!ati_remote->outbuf) return -1; -@@ -649,10 +649,10 @@ static void ati_remote_free_buffers(stru +@@ -653,10 +653,10 @@ static void ati_remote_free_buffers(stru usb_free_urb(ati_remote->irq_urb); usb_free_urb(ati_remote->out_urb); diff --git a/usb/wait_event_interruptible_locked-interface.patch b/usb/wait_event_interruptible_locked-interface.patch index 1be9957699fdd2..e0af33d0afa7d1 100644 --- a/usb/wait_event_interruptible_locked-interface.patch +++ b/usb/wait_event_interruptible_locked-interface.patch @@ -236,7 +236,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> DEFINE_WAIT(__wait); \ --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -3940,6 +3940,7 @@ void __wake_up_locked(wait_queue_head_t +@@ -3950,6 +3950,7 @@ void __wake_up_locked(wait_queue_head_t { __wake_up_common(q, mode, 1, 0, NULL); } @@ -1 +1 @@ -2.6.34-rc6-git1 +2.6.34-rc7 |