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

Commit 16e0e6a8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 25a00ac7 ce03b6d2

Documentation/devicetree/bindings/usb/rockchip,dwc3.txt

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ A child node must exist to represent the core DWC3 IP block. The name of 
the node is not important. The content of the node is defined in dwc3.txt.



Phy documentation is provided in the following places:

Documentation/devicetree/bindings/phy/qcom-dwc3-usb-phy.txt

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt - USB2.0 PHY

Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt     - Type-C PHY



Example device nodes:

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7095,6 +7095,7 @@ F: include/uapi/linux/input.h 
F:	include/uapi/linux/input-event-codes.h

F:	include/linux/input/

F:	Documentation/devicetree/bindings/input/

F:	Documentation/devicetree/bindings/serio/

F:	Documentation/input/



INPUT MULTITOUCH (MT) PROTOCOL

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 18

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Merciless Moray



# *DOCUMENTATION*

arch/arm/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ static struct vm_area_struct gate_vma = { 


static int __init gate_vma_init(void)

{

	vma_init(&gate_vma, NULL);

	gate_vma.vm_page_prot = PAGE_READONLY_EXEC;

	return 0;

}

arch/arm/mach-rpc/ecard.c

+1 −1
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ static void ecard_init_pgtables(struct mm_struct *mm) 


	memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE));



	vma_init(&vma, mm);

	vma.vm_flags = VM_EXEC;

	vma.vm_mm = mm;



	flush_tlb_range(&vma, IO_START, IO_START + IO_SIZE);

	flush_tlb_range(&vma, EASI_START, EASI_START + EASI_SIZE);