Merge branch 'topic/line6' into for-next (7bfb8575) · Commits · 戴 / test

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de>
		Greg Kroah-Hartman <greg@kroah.com>
		Henk Vergonet <Henk.Vergonet@gmail.com>
		Henrik Kretzschmar <henne@nachtwindheim.de>
		Henrik Rydberg <rydberg@bitmath.org>
		Herbert Xu <herbert@gondor.apana.org.au>
		Jacob Shin <Jacob.Shin@amd.com>
		James Bottomley <jejb@mulgrave.(none)>

+7 −6

Original line number	Diff line number	Diff line
		@@ -724,15 +724,15 @@ F: include/uapi/linux/apm_bios.h
		F: drivers/char/apm-emulation.c

		APPLE BCM5974 MULTITOUCH DRIVER
		M: Henrik Rydberg <rydberg@euromail.se>
		M: Henrik Rydberg <rydberg@bitmath.org>
		L: linux-input@vger.kernel.org
		S: Maintained
		S: Odd fixes
		F: drivers/input/mouse/bcm5974.c

		APPLE SMC DRIVER
		M: Henrik Rydberg <rydberg@euromail.se>
		M: Henrik Rydberg <rydberg@bitmath.org>
		L: lm-sensors@lm-sensors.org
		S: Maintained
		S: Odd fixes
		F: drivers/hwmon/applesmc.c

		APPLETALK NETWORK LAYER
		@@ -2259,6 +2259,7 @@ F: drivers/gpio/gpio-bt8xx.c
		BTRFS FILE SYSTEM
		M: Chris Mason <clm@fb.com>
		M: Josef Bacik <jbacik@fb.com>
		M: David Sterba <dsterba@suse.cz>
		L: linux-btrfs@vger.kernel.org
		W: http://btrfs.wiki.kernel.org/
		Q: http://patchwork.kernel.org/project/linux-btrfs/list/
		@@ -4940,10 +4941,10 @@ F: include/uapi/linux/input.h
		F: include/linux/input/

		INPUT MULTITOUCH (MT) PROTOCOL
		M: Henrik Rydberg <rydberg@euromail.se>
		M: Henrik Rydberg <rydberg@bitmath.org>
		L: linux-input@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
		S: Maintained
		S: Odd fixes
		F: Documentation/input/multi-touch-protocol.txt
		F: drivers/input/input-mt.c
		K: \b(ABS\|SYN)_MT_

+2 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 19
		SUBLEVEL = 0
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc4
		NAME = Diseased Newt

		# DOCUMENTATION
		@@ -391,6 +391,7 @@ USERINCLUDE := \
		# Needed to be compatible with the O= option
		LINUXINCLUDE := \
		-I$(srctree)/arch/$(hdr-arch)/include \
		-Iarch/$(hdr-arch)/include/generated/uapi \
		-Iarch/$(hdr-arch)/include/generated \
		$(if $(KBUILD_SRC), -I$(srctree)/include) \
		-Iinclude \

+1 −0

Original line number	Diff line number	Diff line
		@@ -413,6 +413,7 @@
		#define __NR_getrandom (__NR_SYSCALL_BASE+384)
		#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
		#define __NR_bpf (__NR_SYSCALL_BASE+386)
		#define __NR_execveat (__NR_SYSCALL_BASE+387)

		/*
		* The following SWIs are ARM private.

+1 −0

Original line number	Diff line number	Diff line
		@@ -396,6 +396,7 @@
		CALL(sys_getrandom)
		/* 385 */ CALL(sys_memfd_create)
		CALL(sys_bpf)
		CALL(sys_execveat)
		#ifndef syscalls_counted
		.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
		#define syscalls_counted