Commit a9f852e9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock
from commit c8183f54 ("s390/qeth: fix potential deadlock on
workqueue flush"), removed the code which was removed by commit
9897d583 ("s390/qeth: consolidate some duplicated HW cmd code").

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parents 3243e04a 34c36f45

MAINTAINERS

+7 −3
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ F: drivers/net/ethernet/alacritech/* 














FORCEDETH GIGABIT ETHERNET DRIVER















M:	Rain River <rain.1986.08.12@gmail.com>













M:	Zhu Yanjun <yanjun.zhu@oracle.com>













M:	Zhu Yanjun <zyjzyj2000@gmail.com>















L:	netdev@vger.kernel.org















S:	Maintained















F:	drivers/net/ethernet/nvidia/*










@@ -8311,11 +8311,14 @@ F:	drivers/hid/intel-ish-hid/



























INTEL IOMMU (VT-d)















M:	David Woodhouse <dwmw2@infradead.org>













M:	Lu Baolu <baolu.lu@linux.intel.com>















L:	iommu@lists.linux-foundation.org













T:	git git://git.infradead.org/iommu-2.6.git













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git















S:	Supported













F:	drivers/iommu/intel-iommu.c













F:	drivers/iommu/dmar.c













F:	drivers/iommu/intel*.[ch]















F:	include/linux/intel-iommu.h













F:	include/linux/intel-svm.h





























INTEL IOP-ADMA DMA DRIVER















R:	Dan Williams <dan.j.williams@intel.com>










@@ -17227,6 +17230,7 @@ F:	virt/lib/



























VIRTIO AND VHOST VSOCK DRIVER















M:	Stefan Hajnoczi <stefanha@redhat.com>













M:	Stefano Garzarella <sgarzare@redhat.com>















L:	kvm@vger.kernel.org















L:	virtualization@lists.linux-foundation.org















L:	netdev@vger.kernel.org

































Makefile



+1
−1






























Original line number
Diff line number
Diff line








@@ -2,7 +2,7 @@













VERSION = 5















PATCHLEVEL = 4















SUBLEVEL = 0













EXTRAVERSION = -rc7













EXTRAVERSION = -rc8















NAME = Kleptomaniac Octopus































# *DOCUMENTATION*

































arch/arm64/include/asm/asm-uaccess.h



+0
−17






























Original line number
Diff line number
Diff line








@@ -58,23 +58,6 @@ alternative_else_nop_endif













	.endm















#endif





























/*













 * These macros are no-ops when UAO is present.













 */













	.macro	uaccess_disable_not_uao, tmp1, tmp2













	uaccess_ttbr0_disable \tmp1, \tmp2













alternative_if ARM64_ALT_PAN_NOT_UAO













	SET_PSTATE_PAN(1)













alternative_else_nop_endif













	.endm



























	.macro	uaccess_enable_not_uao, tmp1, tmp2, tmp3













	uaccess_ttbr0_enable \tmp1, \tmp2, \tmp3













alternative_if ARM64_ALT_PAN_NOT_UAO













	SET_PSTATE_PAN(0)













alternative_else_nop_endif













	.endm





























/*















 * Remove the address tag from a virtual address, if present.















 */

































arch/arm64/include/asm/uaccess.h



+22
−5






























Original line number
Diff line number
Diff line








@@ -378,20 +378,34 @@ do {									\













extern unsigned long __must_check __arch_copy_from_user(void *to, const void __user *from, unsigned long n);















#define raw_copy_from_user(to, from, n)					\















({									\













	__arch_copy_from_user((to), __uaccess_mask_ptr(from), (n));	\













	unsigned long __acfu_ret;					\













	uaccess_enable_not_uao();					\













	__acfu_ret = __arch_copy_from_user((to),			\













				      __uaccess_mask_ptr(from), (n));	\













	uaccess_disable_not_uao();					\













	__acfu_ret;							\















})































extern unsigned long __must_check __arch_copy_to_user(void __user *to, const void *from, unsigned long n);















#define raw_copy_to_user(to, from, n)					\















({									\













	__arch_copy_to_user(__uaccess_mask_ptr(to), (from), (n));	\













	unsigned long __actu_ret;					\













	uaccess_enable_not_uao();					\













	__actu_ret = __arch_copy_to_user(__uaccess_mask_ptr(to),	\













				    (from), (n));			\













	uaccess_disable_not_uao();					\













	__actu_ret;							\















})































extern unsigned long __must_check __arch_copy_in_user(void __user *to, const void __user *from, unsigned long n);















#define raw_copy_in_user(to, from, n)					\















({									\













	__arch_copy_in_user(__uaccess_mask_ptr(to),			\













	unsigned long __aciu_ret;					\













	uaccess_enable_not_uao();					\













	__aciu_ret = __arch_copy_in_user(__uaccess_mask_ptr(to),	\















				    __uaccess_mask_ptr(from), (n));	\













	uaccess_disable_not_uao();					\













	__aciu_ret;							\















})































#define INLINE_COPY_TO_USER









@@ -400,8 +414,11 @@ extern unsigned long __must_check __arch_copy_in_user(void __user *to, const voi













extern unsigned long __must_check __arch_clear_user(void __user *to, unsigned long n);















static inline unsigned long __must_check __clear_user(void __user *to, unsigned long n)















{













	if (access_ok(to, n))













	if (access_ok(to, n)) {













		uaccess_enable_not_uao();















		n = __arch_clear_user(__uaccess_mask_ptr(to), n);













		uaccess_disable_not_uao();













	}















	return n;















}















#define clear_user	__clear_user

































arch/arm64/lib/clear_user.S



+0
−2






























Original line number
Diff line number
Diff line








@@ -20,7 +20,6 @@













 * Alignment fixed up by hardware.















 */















ENTRY(__arch_clear_user)













	uaccess_enable_not_uao x2, x3, x4















	mov	x2, x1			// save the size for fixup return















	subs	x1, x1, #8















	b.mi	2f









@@ -40,7 +39,6 @@ uao_user_alternative 9f, strh, sttrh, wzr, x0, 2













	b.mi	5f















uao_user_alternative 9f, strb, sttrb, wzr, x0, 0















5:	mov	x0, #0













	uaccess_disable_not_uao x2, x3















	ret















ENDPROC(__arch_clear_user)















EXPORT_SYMBOL(__arch_clear_user)









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE