Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 464b5847 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'irq/urgent' into irq/core 

Merge urgent fixes so pending patches for 4.9 can be applied.
parents 0a30d691 e875bd66

Documentation/devicetree/bindings/mmc/sdhci-st.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
			subsystem (mmcss) inside the FlashSS (available in STiH407 SoC

			family).



- clock-names:		Should be "mmc".

- clock-names:		Should be "mmc" and "icn".  (NB: The latter is not compulsory)

			See: Documentation/devicetree/bindings/resource-names.txt

- clocks:		Phandle to the clock.

			See: Documentation/devicetree/bindings/clock/clock-bindings.txt

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -1625,6 +1625,7 @@ N: rockchip 
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <krzk@kernel.org>

R:	Javier Martinez Canillas <javier@osg.samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained
@@ -2485,7 +2486,7 @@ F: include/net/bluetooth/ 
BONDING DRIVER

M:	Jay Vosburgh <j.vosburgh@gmail.com>

M:	Veaceslav Falico <vfalico@gmail.com>

M:	Andy Gospodarek <gospo@cumulusnetworks.com>

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/bonding/

S:	Supported
@@ -3269,7 +3270,7 @@ S: Maintained 
F:	drivers/net/wan/cosa*



CPMAC ETHERNET DRIVER

M:	Florian Fainelli <florian@openwrt.org>

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/ti/cpmac.c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 8

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*

arch/alpha/include/asm/uaccess.h

+8 −11
Original line number Diff line number Diff line
@@ -371,14 +371,6 @@ __copy_tofrom_user_nocheck(void *to, const void *from, long len) 
	return __cu_len;

}



extern inline long

__copy_tofrom_user(void *to, const void *from, long len, const void __user *validate)

{

	if (__access_ok((unsigned long)validate, len, get_fs()))

		len = __copy_tofrom_user_nocheck(to, from, len);

	return len;

}



#define __copy_to_user(to, from, n)					\

({									\

	__chk_user_ptr(to);						\
@@ -393,17 +385,22 @@ __copy_tofrom_user(void *to, const void *from, long len, const void __user *vali 
#define __copy_to_user_inatomic __copy_to_user

#define __copy_from_user_inatomic __copy_from_user





extern inline long

copy_to_user(void __user *to, const void *from, long n)

{

	return __copy_tofrom_user((__force void *)to, from, n, to);

	if (likely(__access_ok((unsigned long)to, n, get_fs())))

		n = __copy_tofrom_user_nocheck((__force void *)to, from, n);

	return n;

}



extern inline long

copy_from_user(void *to, const void __user *from, long n)

{

	return __copy_tofrom_user(to, (__force void *)from, n, from);

	if (likely(__access_ok((unsigned long)from, n, get_fs())))

		n = __copy_tofrom_user_nocheck(to, (__force void *)from, n);

	else

		memset(to, 0, n);

	return n;

}



extern void __do_clear_user(void);

arch/arc/include/asm/uaccess.h

+9 −2
Original line number Diff line number Diff line
@@ -83,7 +83,10 @@ 
	"2:	;nop\n"				\

	"	.section .fixup, \"ax\"\n"	\

	"	.align 4\n"			\

	"3:	mov %0, %3\n"			\

	"3:	# return -EFAULT\n"		\

	"	mov %0, %3\n"			\

	"	# zero out dst ptr\n"		\

	"	mov %1,  0\n"			\

	"	j   2b\n"			\

	"	.previous\n"			\

	"	.section __ex_table, \"a\"\n"	\
@@ -101,7 +104,11 @@ 
	"2:	;nop\n"				\

	"	.section .fixup, \"ax\"\n"	\

	"	.align 4\n"			\

	"3:	mov %0, %3\n"			\

	"3:	# return -EFAULT\n"		\

	"	mov %0, %3\n"			\

	"	# zero out dst ptr\n"		\

	"	mov %1,  0\n"			\

	"	mov %R1, 0\n"			\

	"	j   2b\n"			\

	"	.previous\n"			\

	"	.section __ex_table, \"a\"\n"	\