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

Commit 3f3558bb authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9a6b4b39 a6391a92

.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)>

Documentation/networking/ip-sysctl.txt

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ fwmark_reflect - BOOLEAN 
route/max_size - INTEGER

	Maximum number of routes allowed in the kernel.  Increase

	this when using large numbers of interfaces and/or routes.

	From linux kernel 3.6 onwards, this is deprecated for ipv4

	as route cache is no longer used.



neigh/default/gc_thresh1 - INTEGER

	Minimum number of entries to keep.  Garbage collector will not

Documentation/target/tcm_mod_builder.py

+12 −37
Original line number 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 += "	.shutdown_session		= " + fabric_mod_name + "_shutdown_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_initiator_sid		= NULL,\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_status			= " + fabric_mod_name + "_queue_status,\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 += "	 * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"

	buf += "	 */\n"
@@ -428,7 +425,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	/*\n"

	buf += "	 * Register the top level struct config_item_type with TCM core\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 += "		printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\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):

			buf += "char *" + fabric_mod_name + "_get_fabric_name(void)\n"

			buf += "{\n"

			buf += "	return \"" + fabric_mod_name[4:] + "\";\n"

			buf += "	return \"" + fabric_mod_name + "\";\n"

			buf += "}\n\n"

			bufi += "char *" + fabric_mod_name + "_get_fabric_name(void);\n"

			continue
@@ -820,27 +817,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\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):

			buf += "u32 " + fabric_mod_name + "_sess_get_index(struct se_session *se_sess)\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"



		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 += "	return 0;\n"

			buf += "	return;\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):

			buf += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *se_cmd)\n"

		if re.search('aborted_task\)\(', fo):

			buf += "void " + fabric_mod_name + "_aborted_task(struct se_cmd *se_cmd)\n"

			buf += "{\n"

			buf += "	return 0;\n"

			buf += "	return;\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)

	if ret:

MAINTAINERS

+17 −7
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/
@@ -4748,7 +4749,7 @@ S: Supported 
F:	drivers/scsi/ipr.*



IBM Power Virtual Ethernet Device Driver

M:	Santiago Leon <santil@linux.vnet.ibm.com>

M:	Thomas Falcon <tlfalcon@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/ibm/ibmveth.*
@@ -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_
@@ -5279,6 +5280,15 @@ W: www.open-iscsi.org 
Q:	http://patchwork.kernel.org/project/linux-rdma/list/

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

M:	Karsten Keil <isdn@linux-pingi.de>

L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)

Makefile

+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 \