Commit cfa637cb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict 



Conflicts:

  include/linux/kcore.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents db779ef6 8c2ffd91

Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required properties: 
    - "renesas,irqc-r8a7793" (R-Car M2-N)

    - "renesas,irqc-r8a7794" (R-Car E2)

    - "renesas,intc-ex-r8a774a1" (RZ/G2M)

    - "renesas,intc-ex-r8a774c0" (RZ/G2E)

    - "renesas,intc-ex-r8a7795" (R-Car H3)

    - "renesas,intc-ex-r8a7796" (R-Car M3-W)

    - "renesas,intc-ex-r8a77965" (R-Car M3-N)

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -8096,6 +8096,16 @@ F: include/linux/iommu.h 
F:	include/linux/of_iommu.h

F:	include/linux/iova.h



IO_URING

M:	Jens Axboe <axboe@kernel.dk>

L:	linux-block@vger.kernel.org

L:	linux-fsdevel@vger.kernel.org

T:	git git://git.kernel.dk/linux-block

T:	git git://git.kernel.dk/liburing

S:	Maintained

F:	fs/io_uring.c

F:	include/uapi/linux/io_uring.h



IP MASQUERADING

M:	Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>

S:	Maintained

Makefile

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

PATCHLEVEL = 1

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Shy Crocodile



# *DOCUMENTATION*

arch/arc/Kconfig

+15 −6
Original line number Diff line number Diff line
@@ -386,6 +386,15 @@ config ARC_HAS_SWAPE 


if ISA_ARCV2



config ARC_USE_UNALIGNED_MEM_ACCESS

	bool "Enable unaligned access in HW"

	default y

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	help

	  The ARC HS architecture supports unaligned memory access

	  which is disabled by default. Enable unaligned access in

	  hardware and use software to use it



config ARC_HAS_LL64

	bool "Insn: 64bit LDD/STD"

	help

arch/arc/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ cflags-$(CONFIG_ARC_HAS_SWAPE) += -mswape 


ifdef CONFIG_ISA_ARCV2



ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS

cflags-y				+= -munaligned-access

else

cflags-y				+= -mno-unaligned-access

endif



ifndef CONFIG_ARC_HAS_LL64

cflags-y				+= -mno-ll64

endif