refresh queue

diff --git a/queue-2.6.16/fs-locks.c-Fix-sys_flock-race.patch b/queue-2.6.16/fs-locks.c-Fix-sys_flock-race.patch
index d7b2dd5fb14a1d0f9d0756043fde9ee7d7fddf4b..068295027dccefd77e0049fc380b4c31fb85598a 100644 (file)
--- a/queue-2.6.16/fs-locks.c-Fix-sys_flock-race.patch
+++ b/queue-2.6.16/fs-locks.c-Fix-sys_flock-race.patch
@@ -25,16 +25,15 @@ Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 
 ---
  fs/locks.c |   30 ++++++++++++++++--------------
  1 file changed, 16 insertions(+), 14 deletions(-)
 
---- linux-2.6.16.13.orig/fs/locks.c
-+++ linux-2.6.16.13/fs/locks.c
-@@ -712,8 +712,9 @@ EXPORT_SYMBOL(posix_locks_deadlock);
+--- linux-2.6.16.16.orig/fs/locks.c
++++ linux-2.6.16.16/fs/locks.c
+@@ -714,8 +714,9 @@ EXPORT_SYMBOL(posix_locks_deadlock);
   * at the head of the list, but that's secret knowledge known only to
   * flock_lock_file and posix_lock_file.
   */
@@ -45,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        struct file_lock **before;
        struct inode * inode = filp->f_dentry->d_inode;
        int error = 0;
-@@ -728,17 +729,19 @@ static int flock_lock_file(struct file *
+@@ -730,17 +731,19 @@ static int flock_lock_file(struct file *
                        continue;
                if (filp != fl->fl_file)
                        continue;
@@ -69,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        /*
         * If a higher-priority process was blocked on the old file lock,
         * give it the opportunity to lock the file.
-@@ -746,26 +749,27 @@ static int flock_lock_file(struct file *
+@@ -748,26 +751,27 @@ static int flock_lock_file(struct file *
        if (found)
                cond_resched();
  
@@ -103,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        return error;
  }
  
-@@ -1529,9 +1533,7 @@ asmlinkage long sys_flock(unsigned int f
+@@ -1532,9 +1536,7 @@ asmlinkage long sys_flock(unsigned int f
                error = flock_lock_file_wait(filp, lock);
  
   out_free:

diff --git a/queue-2.6.16/md-avoid-oops-when-attempting-to-fix-read-errors-on-raid10.patch b/queue-2.6.16/md-avoid-oops-when-attempting-to-fix-read-errors-on-raid10.patch
index 86f0214a8655b5119acd7f3e6d0e2e86d9bc4717..63d387f1a83ca318edb13c3a9b60ccd2d52ad5d6 100644 (file)
--- a/queue-2.6.16/md-avoid-oops-when-attempting-to-fix-read-errors-on-raid10.patch
+++ b/queue-2.6.16/md-avoid-oops-when-attempting-to-fix-read-errors-on-raid10.patch
@@ -15,13 +15,13 @@ NULL!!!
 Signed-off-by: Neil Brown <neilb@suse.de>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 ---
  drivers/md/raid10.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.16.13.orig/drivers/md/raid10.c
-+++ linux-2.6.16.13/drivers/md/raid10.c
+--- linux-2.6.16.16.orig/drivers/md/raid10.c
++++ linux-2.6.16.16/drivers/md/raid10.c
 @@ -1436,9 +1436,9 @@ static void raid10d(mddev_t *mddev)
                                                sl--;
                                                d = r10_bio->devs[sl].devnum;

diff --git a/queue-2.6.16/usb-ub-oops-in-block_uevent.patch b/queue-2.6.16/usb-ub-oops-in-block_uevent.patch
index 59fe63b4d7d7fe179a52b20e1efce460c8face29..cc7c3937280aabf4faef8500b745ffea5f1ff670 100644 (file)
--- a/queue-2.6.16/usb-ub-oops-in-block_uevent.patch
+++ b/queue-2.6.16/usb-ub-oops-in-block_uevent.patch
@@ -17,13 +17,14 @@ device structures (kobjects actually).
 
 Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 
 ---
  drivers/block/ub.c |   18 ++++++++++--------
  1 file changed, 10 insertions(+), 8 deletions(-)
 
---- linux-2.6.16.13.orig/drivers/block/ub.c
-+++ linux-2.6.16.13/drivers/block/ub.c
+--- linux-2.6.16.16.orig/drivers/block/ub.c
++++ linux-2.6.16.16/drivers/block/ub.c
 @@ -704,6 +704,9 @@ static void ub_cleanup(struct ub_dev *sc
                kfree(lun);
        }

diff --git a/queue-2.6.16/via-rhine-zero-pad-short-packets-on-rhine-i-ethernet-cards.patch b/queue-2.6.16/via-rhine-zero-pad-short-packets-on-rhine-i-ethernet-cards.patch
index ee99082c2333341ca5310b33724bd64ece4b84d0..5aa052f1645fdfab3bdcf87747ee7df4624e320c 100644 (file)
--- a/queue-2.6.16/via-rhine-zero-pad-short-packets-on-rhine-i-ethernet-cards.patch
+++ b/queue-2.6.16/via-rhine-zero-pad-short-packets-on-rhine-i-ethernet-cards.patch
@@ -39,13 +39,14 @@ Cc: Jeff Garzik <jeff@garzik.org>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Jeff Garzik <jeff@garzik.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 
 ---
  drivers/net/via-rhine.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
---- linux-2.6.16.13.orig/drivers/net/via-rhine.c
-+++ linux-2.6.16.13/drivers/net/via-rhine.c
+--- linux-2.6.16.16.orig/drivers/net/via-rhine.c
++++ linux-2.6.16.16/drivers/net/via-rhine.c
 @@ -129,6 +129,7 @@
        - Massive clean-up
        - Rewrite PHY, media handling (remove options, full_duplex, backoff)