Merge branch 'for_linus' into for_next (1cd6b7be) · Commits · e / devices / android_kernel_samsung_universal8895

.mailmap

+1 −0

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

Documentation/target/tcm_mod_builder.py

+12 −37

Original line number	Original line	Diff line number	Diff line
	@@ -389,9 +389,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
	buf += " .release_cmd = " + fabric_mod_name + "_release_cmd,\n"		buf += " .release_cmd = " + fabric_mod_name + "_release_cmd,\n"
	buf += " .shutdown_session = " + fabric_mod_name + "_shutdown_session,\n"		buf += " .shutdown_session = " + fabric_mod_name + "_shutdown_session,\n"
	buf += " .close_session = " + fabric_mod_name + "_close_session,\n"		buf += " .close_session = " + fabric_mod_name + "_close_session,\n"
	buf += " .stop_session = " + fabric_mod_name + "_stop_session,\n"
	buf += " .fall_back_to_erl0 = " + fabric_mod_name + "_reset_nexus,\n"
	buf += " .sess_logged_in = " + fabric_mod_name + "_sess_logged_in,\n"
	buf += " .sess_get_index = " + fabric_mod_name + "_sess_get_index,\n"		buf += " .sess_get_index = " + fabric_mod_name + "_sess_get_index,\n"
	buf += " .sess_get_initiator_sid = NULL,\n"		buf += " .sess_get_initiator_sid = NULL,\n"
	buf += " .write_pending = " + fabric_mod_name + "_write_pending,\n"		buf += " .write_pending = " + fabric_mod_name + "_write_pending,\n"
	@@ -402,7 +399,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
	buf += " .queue_data_in = " + fabric_mod_name + "_queue_data_in,\n"		buf += " .queue_data_in = " + fabric_mod_name + "_queue_data_in,\n"
	buf += " .queue_status = " + fabric_mod_name + "_queue_status,\n"		buf += " .queue_status = " + fabric_mod_name + "_queue_status,\n"
	buf += " .queue_tm_rsp = " + fabric_mod_name + "_queue_tm_rsp,\n"		buf += " .queue_tm_rsp = " + fabric_mod_name + "_queue_tm_rsp,\n"
	buf += " .is_state_remove = " + fabric_mod_name + "_is_state_remove,\n"		buf += " .aborted_task = " + fabric_mod_name + "_aborted_task,\n"
	buf += " /*\n"		buf += " /*\n"
	buf += " * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"		buf += " * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"
	buf += " */\n"		buf += " */\n"
	@@ -428,7 +425,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
	buf += " /*\n"		buf += " /*\n"
	buf += " * Register the top level struct config_item_type with TCM core\n"		buf += " * Register the top level struct config_item_type with TCM core\n"
	buf += " */\n"		buf += " */\n"
	buf += " fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name[4:] + "\");\n"		buf += " fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name + "\");\n"
	buf += " if (IS_ERR(fabric)) {\n"		buf += " if (IS_ERR(fabric)) {\n"
	buf += " printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\n"		buf += " printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\n"
	buf += " return PTR_ERR(fabric);\n"		buf += " return PTR_ERR(fabric);\n"
	@@ -595,7 +592,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
	if re.search('get_fabric_name', fo):		if re.search('get_fabric_name', fo):
	buf += "char *" + fabric_mod_name + "_get_fabric_name(void)\n"		buf += "char *" + fabric_mod_name + "_get_fabric_name(void)\n"
	buf += "{\n"		buf += "{\n"
	buf += " return \"" + fabric_mod_name[4:] + "\";\n"		buf += " return \"" + fabric_mod_name + "\";\n"
	buf += "}\n\n"		buf += "}\n\n"
	bufi += "char *" + fabric_mod_name + "_get_fabric_name(void);\n"		bufi += "char *" + fabric_mod_name + "_get_fabric_name(void);\n"
	continue		continue
	@@ -820,27 +817,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
	buf += "}\n\n"		buf += "}\n\n"
	bufi += "void " + fabric_mod_name + "_close_session(struct se_session *);\n"		bufi += "void " + fabric_mod_name + "_close_session(struct se_session *);\n"

	if re.search('stop_session\)\(', fo):
	buf += "void " + fabric_mod_name + "_stop_session(struct se_session *se_sess, int sess_sleep , int conn_sleep)\n"
	buf += "{\n"
	buf += " return;\n"
	buf += "}\n\n"
	bufi += "void " + fabric_mod_name + "_stop_session(struct se_session *, int, int);\n"

	if re.search('fall_back_to_erl0\)\(', fo):
	buf += "void " + fabric_mod_name + "_reset_nexus(struct se_session *se_sess)\n"
	buf += "{\n"
	buf += " return;\n"
	buf += "}\n\n"
	bufi += "void " + fabric_mod_name + "_reset_nexus(struct se_session *);\n"

	if re.search('sess_logged_in\)\(', fo):
	buf += "int " + fabric_mod_name + "_sess_logged_in(struct se_session *se_sess)\n"
	buf += "{\n"
	buf += " return 0;\n"
	buf += "}\n\n"
	bufi += "int " + fabric_mod_name + "_sess_logged_in(struct se_session *);\n"

	if re.search('sess_get_index\)\(', fo):		if re.search('sess_get_index\)\(', fo):
	buf += "u32 " + fabric_mod_name + "_sess_get_index(struct se_session *se_sess)\n"		buf += "u32 " + fabric_mod_name + "_sess_get_index(struct se_session *se_sess)\n"
	buf += "{\n"		buf += "{\n"
	@@ -898,19 +874,18 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
	bufi += "int " + fabric_mod_name + "_queue_status(struct se_cmd *);\n"		bufi += "int " + fabric_mod_name + "_queue_status(struct se_cmd *);\n"

	if re.search('queue_tm_rsp\)\(', fo):		if re.search('queue_tm_rsp\)\(', fo):
	buf += "int " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *se_cmd)\n"		buf += "void " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *se_cmd)\n"
	buf += "{\n"		buf += "{\n"
	buf += " return 0;\n"		buf += " return;\n"
	buf += "}\n\n"		buf += "}\n\n"
	bufi += "int " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n"		bufi += "void " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n"

	if re.search('is_state_remove\)\(', fo):		if re.search('aborted_task\)\(', fo):
	buf += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *se_cmd)\n"		buf += "void " + fabric_mod_name + "_aborted_task(struct se_cmd *se_cmd)\n"
	buf += "{\n"		buf += "{\n"
	buf += " return 0;\n"		buf += " return;\n"
	buf += "}\n\n"		buf += "}\n\n"
	bufi += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *);\n"		bufi += "void " + fabric_mod_name + "_aborted_task(struct se_cmd *);\n"


	ret = p.write(buf)		ret = p.write(buf)
	if ret:		if ret:

MAINTAINERS

+16 −6

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

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

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

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

	INPUT MULTITOUCH (MT) PROTOCOL		INPUT MULTITOUCH (MT) PROTOCOL
	M: Henrik Rydberg <rydberg@euromail.se>		M: Henrik Rydberg <rydberg@bitmath.org>
	L: linux-input@vger.kernel.org		L: linux-input@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git		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: Documentation/input/multi-touch-protocol.txt
	F: drivers/input/input-mt.c		F: drivers/input/input-mt.c
	K: \b(ABS\|SYN)_MT_		K: \b(ABS\|SYN)_MT_
	@@ -5279,6 +5280,15 @@ W: www.open-iscsi.org
	Q: http://patchwork.kernel.org/project/linux-rdma/list/		Q: http://patchwork.kernel.org/project/linux-rdma/list/
	F: drivers/infiniband/ulp/iser/		F: drivers/infiniband/ulp/iser/

			ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
			M: Sagi Grimberg <sagig@mellanox.com>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
			L: linux-rdma@vger.kernel.org
			L: target-devel@vger.kernel.org
			S: Supported
			W: http://www.linux-iscsi.org
			F: drivers/infiniband/ulp/isert

	ISDN SUBSYSTEM		ISDN SUBSYSTEM
	M: Karsten Keil <isdn@linux-pingi.de>		M: Karsten Keil <isdn@linux-pingi.de>
	L: isdn4linux@listserv.isdn4linux.de (subscribers-only)		L: isdn4linux@listserv.isdn4linux.de (subscribers-only)

Makefile

+2 −1

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

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

arch/arm/include/uapi/asm/unistd.h

+1 −0

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

	/*		/*
	* The following SWIs are ARM private.		* The following SWIs are ARM private.