Re: Linux 3.10.92
diff --git a/Makefile b/Makefile
index ba6a94cf354b..25701b67bb6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 10
-SUBLEVEL = 91
+SUBLEVEL = 92
EXTRAVERSION =
NAME = TOSSUG Baby Fish
diff --git a/arch/m68k/include/asm/uaccess_mm.h
b/arch/m68k/include/asm/uaccess_mm.h
index 472c891a4aee..15901db435b9 100644
--- a/arch/m68k/include/asm/uaccess_mm.h
+++ b/arch/m68k/include/asm/uaccess_mm.h
@@ -90,7 +90,7 @@ asm volatile ("\n"\
__put_user_asm(__pu_err, __pu_val, ptr, b, d, -EFAULT); \
break; \
case 2: \
- __put_user_asm(__pu_err, __pu_val, ptr, w, d, -EFAULT); \
+ __put_user_asm(__pu_err, __pu_val, ptr, w, r, -EFAULT); \
break; \
case 4: \
__put_user_asm(__pu_err, __pu_val, ptr, l, r, -EFAULT); \
@@ -158,7 +158,7 @@ asm volatile ("\n" \
__get_user_asm(__gu_err, x, ptr, u8, b, d, -EFAULT);\
break; \
case 2: \
- __get_user_asm(__gu_err, x, ptr, u16, w, d, -EFAULT); \
+ __get_user_asm(__gu_err, x, ptr, u16, w, r, -EFAULT); \
break; \
case 4: \
__get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT); \
@@ -245,7 +245,7 @@ __constant_copy_from_user(void *to, const void __user
*from, unsigned long n)
__get_user_asm(res, *(u8 *)to, (u8 __user *)from, u8, b, d, 1);
break;
case 2:
- __get_user_asm(res, *(u16 *)to, (u16 __user *)from, u16, w, d,
2);
+ __get_user_asm(res, *(u16 *)to, (u16 __user *)from, u16, w, r,
2);
break;
case 3:
__constant_copy_from_user_asm(res, to, from, tmp, 3, w, b,);
@@ -326,7 +326,7 @@ __constant_copy_to_user(void __user *to, const void *from,
unsigned long n)
__put_user_asm(res, *(u8 *)from, (u8 __user *)to, b, d, 1);
break;
case 2:
- __put_user_asm(res, *(u16 *)from, (u16 __user *)to, w, d, 2);
+ __put_user_asm(res, *(u16 *)from, (u16 __user *)to, w, r, 2);
break;
case 3:
__constant_copy_to_user_asm(res, to, from, tmp, 3, w, b,);
diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c
index 5e97f2ee7c11..35d1442dee89 100644
--- a/arch/m68k/lib/uaccess.c
+++ b/arch/m68k/lib/uaccess.c
@@ -52,7 +52,7 @@ unsigned long __generic_copy_from_user(void *to, const void
__user *from,
" .long 3b,30b\n"
" .long 5b,50b\n"
" .previous"
- : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
+ : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
: "0" (n / 4), "d" (n & 3));
return res;
@@ -96,7 +96,7 @@ unsigned long __generic_copy_to_user(void __user *to, const
void *from,
" .long 7b,50b\n"
" .long 8b,50b\n"
" .previous"
- : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
+ : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
: "0" (n / 4), "d" (n & 3));
return res;
@@ -141,7 +141,7 @@ unsigned long __clear_user(void __user *to, unsigned long n)
" .long 7b,40b\n"
" .previous"
: "=d" (res), "+a" (to)
- : "r" (0), "0" (n / 4), "d" (n & 3));
+ : "d" (0), "0" (n / 4), "d" (n & 3));
return res;
}
diff --git a/arch/sparc/crypto/aes_glue.c b/arch/sparc/crypto/aes_glue.c
index ded4cee35318..dc78cdd43e0a 100644
--- a/arch/sparc/crypto/aes_glue.c
+++ b/arch/sparc/crypto/aes_glue.c
@@ -433,6 +433,7 @@ static struct crypto_alg algs[] = { {
.blkcipher = {
.min_keysize= AES_MIN_KEY_SIZE,
.max_keysize= AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
.setkey = aes_set_key,
.encrypt= cbc_encrypt,
.decrypt= cbc_decrypt,
@@ -452,6 +453,7 @@ static struct crypto_alg algs[] = { {
.blkcipher = {
.min_keysize= AES_MIN_KEY_SIZE,
.max_keysize= AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
.setkey = aes_set_key,
Linux 3.10.92
I'm announcing the release of the 3.10.92 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
linux-3.10.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
Makefile |2 +-
arch/m68k/include/asm/uaccess_mm.h |8
arch/m68k/lib/uaccess.c|6 +++---
arch/sparc/crypto/aes_glue.c |2 ++
arch/sparc/crypto/camellia_glue.c |1 +
arch/sparc/crypto/des_glue.c |2 ++
crypto/ahash.c |3 ++-
drivers/block/rbd.c|1 -
drivers/i2c/busses/i2c-rcar.c |7 ---
drivers/md/dm-thin.c |2 +-
drivers/net/ppp/pppoe.c|1 -
drivers/net/usb/asix_devices.c | 16 ++--
include/linux/skbuff.h |3 +++
include/net/af_unix.h |6 +-
include/net/sock.h |8
kernel/workqueue.c |8
net/core/ethtool.c |2 +-
net/core/skbuff.c |9 +
net/l2tp/l2tp_core.c | 11 +--
net/unix/af_unix.c | 14 +-
20 files changed, 70 insertions(+), 42 deletions(-)
Aaron Conole (2):
af_unix: Convert the unix_sk macro to an inline function for type safety
af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag
Alexander Couzens (1):
l2tp: protect tunnel->del_work by ref_count
Charles Keepax (1):
asix: Do full reset during ax88772_bind
Dave Kleikamp (1):
crypto: sparc - initialize blkcipher.ivsize
Eric Dumazet (1):
net: add pfmemalloc check in sk_add_backlog()
Geert Uytterhoeven (1):
m68k/uaccess: Fix asm constraints for userspace access
Greg Kroah-Hartman (1):
Linux 3.10.92
Guillaume Nault (1):
ppp: don't override sk->sk_state in pppoe_flush_dev()
Ilya Dryomov (1):
rbd: fix double free on rbd_dev->header_name
Joe Perches (1):
ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
Michel Stam (1):
asix: Don't reset PHY on if_up for ASIX 88772
Mike Snitzer (1):
dm thin: fix missing pool reference count decrement in pool_ctr error path
Pravin B Shelar (2):
skbuff: Fix skb checksum flag on skb pull
skbuff: Fix skb checksum partial check.
Russell King (1):
crypto: ahash - ensure statesize is non-zero
Shaohua Li (1):
workqueue: make sure delayed work run in local cpu
Wolfram Sang (1):
i2c: rcar: enable RuntimePM before registering to the core
signature.asc
Description: PGP signature
Re: Linux 3.10.92
diff --git a/Makefile b/Makefile
index ba6a94cf354b..25701b67bb6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 10
-SUBLEVEL = 91
+SUBLEVEL = 92
EXTRAVERSION =
NAME = TOSSUG Baby Fish
diff --git a/arch/m68k/include/asm/uaccess_mm.h
b/arch/m68k/include/asm/uaccess_mm.h
index 472c891a4aee..15901db435b9 100644
--- a/arch/m68k/include/asm/uaccess_mm.h
+++ b/arch/m68k/include/asm/uaccess_mm.h
@@ -90,7 +90,7 @@ asm volatile ("\n"\
__put_user_asm(__pu_err, __pu_val, ptr, b, d, -EFAULT); \
break; \
case 2: \
- __put_user_asm(__pu_err, __pu_val, ptr, w, d, -EFAULT); \
+ __put_user_asm(__pu_err, __pu_val, ptr, w, r, -EFAULT); \
break; \
case 4: \
__put_user_asm(__pu_err, __pu_val, ptr, l, r, -EFAULT); \
@@ -158,7 +158,7 @@ asm volatile ("\n" \
__get_user_asm(__gu_err, x, ptr, u8, b, d, -EFAULT);\
break; \
case 2: \
- __get_user_asm(__gu_err, x, ptr, u16, w, d, -EFAULT); \
+ __get_user_asm(__gu_err, x, ptr, u16, w, r, -EFAULT); \
break; \
case 4: \
__get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT); \
@@ -245,7 +245,7 @@ __constant_copy_from_user(void *to, const void __user
*from, unsigned long n)
__get_user_asm(res, *(u8 *)to, (u8 __user *)from, u8, b, d, 1);
break;
case 2:
- __get_user_asm(res, *(u16 *)to, (u16 __user *)from, u16, w, d,
2);
+ __get_user_asm(res, *(u16 *)to, (u16 __user *)from, u16, w, r,
2);
break;
case 3:
__constant_copy_from_user_asm(res, to, from, tmp, 3, w, b,);
@@ -326,7 +326,7 @@ __constant_copy_to_user(void __user *to, const void *from,
unsigned long n)
__put_user_asm(res, *(u8 *)from, (u8 __user *)to, b, d, 1);
break;
case 2:
- __put_user_asm(res, *(u16 *)from, (u16 __user *)to, w, d, 2);
+ __put_user_asm(res, *(u16 *)from, (u16 __user *)to, w, r, 2);
break;
case 3:
__constant_copy_to_user_asm(res, to, from, tmp, 3, w, b,);
diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c
index 5e97f2ee7c11..35d1442dee89 100644
--- a/arch/m68k/lib/uaccess.c
+++ b/arch/m68k/lib/uaccess.c
@@ -52,7 +52,7 @@ unsigned long __generic_copy_from_user(void *to, const void
__user *from,
" .long 3b,30b\n"
" .long 5b,50b\n"
" .previous"
- : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
+ : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
: "0" (n / 4), "d" (n & 3));
return res;
@@ -96,7 +96,7 @@ unsigned long __generic_copy_to_user(void __user *to, const
void *from,
" .long 7b,50b\n"
" .long 8b,50b\n"
" .previous"
- : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
+ : "=d" (res), "+a" (from), "+a" (to), "=" (tmp)
: "0" (n / 4), "d" (n & 3));
return res;
@@ -141,7 +141,7 @@ unsigned long __clear_user(void __user *to, unsigned long n)
" .long 7b,40b\n"
" .previous"
: "=d" (res), "+a" (to)
- : "r" (0), "0" (n / 4), "d" (n & 3));
+ : "d" (0), "0" (n / 4), "d" (n & 3));
return res;
}
diff --git a/arch/sparc/crypto/aes_glue.c b/arch/sparc/crypto/aes_glue.c
index ded4cee35318..dc78cdd43e0a 100644
--- a/arch/sparc/crypto/aes_glue.c
+++ b/arch/sparc/crypto/aes_glue.c
@@ -433,6 +433,7 @@ static struct crypto_alg algs[] = { {
.blkcipher = {
.min_keysize= AES_MIN_KEY_SIZE,
.max_keysize= AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
.setkey = aes_set_key,
.encrypt= cbc_encrypt,
.decrypt= cbc_decrypt,
@@ -452,6 +453,7 @@ static struct crypto_alg algs[] = { {
.blkcipher = {
.min_keysize= AES_MIN_KEY_SIZE,
.max_keysize= AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
.setkey = aes_set_key,
Linux 3.10.92
I'm announcing the release of the 3.10.92 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
linux-3.10.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
Makefile |2 +-
arch/m68k/include/asm/uaccess_mm.h |8
arch/m68k/lib/uaccess.c|6 +++---
arch/sparc/crypto/aes_glue.c |2 ++
arch/sparc/crypto/camellia_glue.c |1 +
arch/sparc/crypto/des_glue.c |2 ++
crypto/ahash.c |3 ++-
drivers/block/rbd.c|1 -
drivers/i2c/busses/i2c-rcar.c |7 ---
drivers/md/dm-thin.c |2 +-
drivers/net/ppp/pppoe.c|1 -
drivers/net/usb/asix_devices.c | 16 ++--
include/linux/skbuff.h |3 +++
include/net/af_unix.h |6 +-
include/net/sock.h |8
kernel/workqueue.c |8
net/core/ethtool.c |2 +-
net/core/skbuff.c |9 +
net/l2tp/l2tp_core.c | 11 +--
net/unix/af_unix.c | 14 +-
20 files changed, 70 insertions(+), 42 deletions(-)
Aaron Conole (2):
af_unix: Convert the unix_sk macro to an inline function for type safety
af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag
Alexander Couzens (1):
l2tp: protect tunnel->del_work by ref_count
Charles Keepax (1):
asix: Do full reset during ax88772_bind
Dave Kleikamp (1):
crypto: sparc - initialize blkcipher.ivsize
Eric Dumazet (1):
net: add pfmemalloc check in sk_add_backlog()
Geert Uytterhoeven (1):
m68k/uaccess: Fix asm constraints for userspace access
Greg Kroah-Hartman (1):
Linux 3.10.92
Guillaume Nault (1):
ppp: don't override sk->sk_state in pppoe_flush_dev()
Ilya Dryomov (1):
rbd: fix double free on rbd_dev->header_name
Joe Perches (1):
ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
Michel Stam (1):
asix: Don't reset PHY on if_up for ASIX 88772
Mike Snitzer (1):
dm thin: fix missing pool reference count decrement in pool_ctr error path
Pravin B Shelar (2):
skbuff: Fix skb checksum flag on skb pull
skbuff: Fix skb checksum partial check.
Russell King (1):
crypto: ahash - ensure statesize is non-zero
Shaohua Li (1):
workqueue: make sure delayed work run in local cpu
Wolfram Sang (1):
i2c: rcar: enable RuntimePM before registering to the core
signature.asc
Description: PGP signature
