Commit 9d49aea1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Small conflict around locking in rxrpc_process_event() -
channel_lock moved to bundle in next, while state lock
needs _bh() from net.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9faebeb2 3fdd47c3

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,11 @@ S: Odd Fixes 
F:	drivers/amba/

F:	include/linux/amba/bus.h













ARM PRIMECELL CLCD PL110 DRIVER













M:	Russell King <linux@armlinux.org.uk>













S:	Odd Fixes













F:	drivers/video/fbdev/amba-clcd.*



























ARM PRIMECELL KMI PL050 DRIVER















M:	Russell King <linux@armlinux.org.uk>















S:	Odd Fixes

































arch/arm/xen/enlighten.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -150,7 +150,7 @@ static int xen_starting_cpu(unsigned int cpu)













	pr_info("Xen: initializing cpu%d\n", cpu);















	vcpup = per_cpu_ptr(xen_vcpu_info, cpu);





























	info.mfn = virt_to_gfn(vcpup);













	info.mfn = percpu_to_gfn(vcpup);















	info.offset = xen_offset_in_page(vcpup);































	err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, xen_vcpu_nr(cpu),

































arch/arm64/crypto/aes-neonbs-core.S



+2
−2






























Original line number
Diff line number
Diff line








@@ -788,7 +788,7 @@ SYM_FUNC_START_LOCAL(__xts_crypt8)





























0:	mov		bskey, x21















	mov		rounds, x22













	br		x7













	br		x16















SYM_FUNC_END(__xts_crypt8)































	.macro		__xts_crypt, do8, o0, o1, o2, o3, o4, o5, o6, o7









@@ -806,7 +806,7 @@ SYM_FUNC_END(__xts_crypt8)













	uzp1		v30.4s, v30.4s, v25.4s















	ld1		{v25.16b}, [x24]





























99:	adr		x7, \do8













99:	adr		x16, \do8















	bl		__xts_crypt8































	ldp		q16, q17, [sp, #.Lframe_local_offset]

































drivers/gpu/drm/nouveau/nouveau_mem.c



+2
−0






























Original line number
Diff line number
Diff line








@@ -176,6 +176,8 @@ void













nouveau_mem_del(struct ttm_mem_reg *reg)















{















	struct nouveau_mem *mem = nouveau_mem(reg);













	if (!mem)













		return;















	nouveau_mem_fini(mem);















	kfree(reg->mm_node);















	reg->mm_node = NULL;

































drivers/gpu/drm/nouveau/nvkm/engine/device/base.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,













		case 0x168: device->chip = &nv168_chipset; break;















		default:















			nvdev_error(device, "unknown chipset (%08x)\n", boot0);













			ret = -ENODEV;















			goto done;















		}

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE