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

Commit d1fc4440 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

Merge tag 'v3.19-rc5' into next 

Linux 3.19-rc5

Conflicts:
	drivers/usb/dwc2/gadget.c
	drivers/usb/gadget/udc/bdc/bdc_ep.c
parents fe198e34 ec6f34e5

Documentation/ABI/testing/sysfs-class-mei

+15 −0
Original line number Diff line number Diff line
@@ -14,3 +14,18 @@ Description: 
		The /sys/class/mei/meiN directory is created for

		each probed mei device



What:		/sys/class/mei/meiN/fw_status

Date:		Nov 2014

KernelVersion:	3.19

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Display fw status registers content



		The ME FW writes its status information into fw status

		registers for BIOS and OS to monitor fw health.



		The register contains running state, power management

		state, error codes, and others. The way the registers

		are decoded depends on PCH or SoC generation.

		Also number of registers varies between 1 and 6

		depending on generation.

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:

Documentation/thermal/cpu-cooling-api.txt

+13 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ CPU cooling APIs How To 


Written by Amit Daniel Kachhap <amit.kachhap@linaro.org>



Updated: 12 May 2012

Updated: 6 Jan 2015



Copyright (c)  2012 Samsung Electronics Co., Ltd(http://www.samsung.com)
@@ -25,7 +25,18 @@ the user. The registration APIs returns the cooling device pointer. 


   clip_cpus: cpumask of cpus where the frequency constraints will happen.



1.1.2 void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)

1.1.2 struct thermal_cooling_device *of_cpufreq_cooling_register(

	struct device_node *np, const struct cpumask *clip_cpus)



    This interface function registers the cpufreq cooling device with

    the name "thermal-cpufreq-%x" linking it with a device tree node, in

    order to bind it via the thermal DT code. This api can support multiple

    instances of cpufreq cooling devices.



    np: pointer to the cooling device device tree node

    clip_cpus: cpumask of cpus where the frequency constraints will happen.



1.1.3 void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)



    This interface function unregisters the "thermal-cpufreq-%x" cooling device.

MAINTAINERS

+14 −5
Original line number Diff line number Diff line
@@ -3183,7 +3183,7 @@ L: dmaengine@vger.kernel.org 
Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/

S:	Maintained

F:	drivers/dma/

F:	include/linux/dma*

F:	include/linux/dmaengine.h

F:	Documentation/dmaengine/

T:	git git://git.infradead.org/users/vkoul/slave-dma.git
@@ -4749,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.*
@@ -5280,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)
@@ -7738,8 +7747,7 @@ F: Documentation/scsi/LICENSE.qla2xxx 
F:	drivers/scsi/qla2xxx/



QLOGIC QLA4XXX iSCSI DRIVER

M:	Vikas Chaudhary <vikas.chaudhary@qlogic.com>

M:	iscsi-driver@qlogic.com

M:	QLogic-Storage-Upstream@qlogic.com

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	Documentation/scsi/LICENSE.qla4xxx
@@ -9534,7 +9542,8 @@ F: drivers/platform/x86/thinkpad_acpi.c 
TI BANDGAP AND THERMAL DRIVER

M:	Eduardo Valentin <edubezval@gmail.com>

L:	linux-pm@vger.kernel.org

S:	Supported

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/thermal/ti-soc-thermal/



TI CLOCK DRIVER