compat-drivers: refresh patches for next-20121011

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch
index 68f4a5060befecd69f831ab2372d1517b2aa0056..618f86d9e61d27f858207c6e902a3b59119620cb 100644 (file)
--- a/patches/drm/04-revert-prime-support.patch
+++ b/patches/drm/04-revert-prime-support.patch
@@ -323,7 +323,7 @@ not < 3.3.0.
  
  static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj);
  static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj);
-@@ -3766,8 +3768,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3772,8 +3774,10 @@ void i915_gem_free_object(struct drm_gem
  
        BUG_ON(obj->pages);
  

diff --git a/patches/drm/07-intel-gtt.patch b/patches/drm/07-intel-gtt.patch
index c40ae7c33504f50b3a383584a998db6ade37e7e7..6a49c5f48c199ab31d19eea5ed0f370a95cba5ad 100644 (file)
--- a/patches/drm/07-intel-gtt.patch
+++ b/patches/drm/07-intel-gtt.patch
@@ -24,7 +24,7 @@ Date:   Thu Jun 7 15:56:03 2012 +0200
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3961,8 +3961,10 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3967,8 +3967,10 @@ i915_gem_init_hw(struct drm_device *dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
  

diff --git a/patches/drm/08-shmem_truncate_range.patch b/patches/drm/08-shmem_truncate_range.patch
index 0955648210badbd1ac404adf285fc586f091f0f7..71ad03bfa1490fdffc547105e8d4bae229ad454e 100644 (file)
--- a/patches/drm/08-shmem_truncate_range.patch
+++ b/patches/drm/08-shmem_truncate_range.patch
@@ -27,7 +27,7 @@ Date:   Mon Jun 27 16:18:19 2011 -0700
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1642,7 +1642,14 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1648,7 +1648,14 @@ i915_gem_object_truncate(struct drm_i915
         * backing pages, *now*.
         */
        inode = obj->base.filp->f_path.dentry->d_inode;

diff --git a/patches/network/16-bluetooth.patch b/patches/network/16-bluetooth.patch
index 099f5013878aa7a80a84342edff26049b04766e0..6beba28a8058f306da15b174c869bdf073fc210d 100644 (file)
--- a/patches/network/16-bluetooth.patch
+++ b/patches/network/16-bluetooth.patch
@@ -534,7 +534,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/l2cap_sock.c
 +++ b/net/bluetooth/l2cap_sock.c
-@@ -564,7 +564,14 @@ static int l2cap_sock_setsockopt_old(str
+@@ -565,7 +565,14 @@ static int l2cap_sock_setsockopt_old(str
        return err;
  }
  
@@ -549,7 +549,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk = sock->sk;
        struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1194,8 +1201,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1196,8 +1203,12 @@ static struct sock *l2cap_sock_alloc(str
        return sk;
  }
  
@@ -562,7 +562,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -1207,7 +1218,11 @@ static int l2cap_sock_create(struct net
+@@ -1209,7 +1220,11 @@ static int l2cap_sock_create(struct net
                        sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
  

diff --git a/patches/network/25-multicast-list_head.patch b/patches/network/25-multicast-list_head.patch
index 2955a531cea06f5145ce6747ff335ee844c6a301..bc1b808d8a76d017789bf0efef511c9eb1472635 100644 (file)
--- a/patches/network/25-multicast-list_head.patch
+++ b/patches/network/25-multicast-list_head.patch
@@ -179,7 +179,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        return ((u64)(mfilt[1]) << 32) | mfilt[0];
 --- a/drivers/net/wireless/ath/carl9170/main.c
 +++ b/drivers/net/wireless/ath/carl9170/main.c
-@@ -899,17 +899,35 @@ out:
+@@ -898,17 +898,35 @@ out:
        return err;
  }