Skip to content

Commit 484c60e

Browse files
gregkhgregkh
committed
Merge 3.19-rc5 into staging-next
We want the staging fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 06d30f0 + ec6f34e commit 484c60e

File tree

613 files changed

+6256
-4336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

613 files changed

+6256
-4336
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <[email protected]>
5151
Greg Kroah-Hartman <[email protected]>
5252
Henk Vergonet <[email protected]>
5353
Henrik Kretzschmar <[email protected]>
54+
Henrik Rydberg <[email protected]>
5455
Herbert Xu <[email protected]>
5556
Jacob Shin <[email protected]>
5657
James Bottomley <jejb@mulgrave.(none)>

‎Documentation/ABI/testing/sysfs-class-mei

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,18 @@ Description:
1414
The /sys/class/mei/meiN directory is created for
1515
each probed mei device
1616

17+
What: /sys/class/mei/meiN/fw_status
18+
Date: Nov 2014
19+
KernelVersion: 3.19
20+
Contact: Tomas Winkler <[email protected]>
21+
Description: Display fw status registers content
22+
23+
The ME FW writes its status information into fw status
24+
registers for BIOS and OS to monitor fw health.
25+
26+
The register contains running state, power management
27+
state, error codes, and others. The way the registers
28+
are decoded depends on PCH or SoC generation.
29+
Also number of registers varies between 1 and 6
30+
depending on generation.
31+

‎Documentation/devicetree/bindings/input/gpio-keys.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ Optional properties:
1010
Each button (key) is represented as a sub-node of "gpio-keys":
1111
Subnode properties:
1212

13+
- gpios: OF device-tree gpio specification.
14+
- interrupts: the interrupt line for that input.
1315
- label: Descriptive name of the key.
1416
- linux,code: Keycode to emit.
1517

16-
Required mutual exclusive subnode-properties:
17-
- gpios: OF device-tree gpio specification.
18-
- interrupts: the interrupt line for that input
18+
Note that either "interrupts" or "gpios" properties can be omitted, but not
19+
both at the same time. Specifying both properties is allowed.
1920

2021
Optional subnode-properties:
2122
- linux,input-type: Specify event type this button/key generates.
2223
If not specified defaults to <1> == EV_KEY.
2324
- debounce-interval: Debouncing interval time in milliseconds.
2425
If not specified defaults to 5.
2526
- gpio-key,wakeup: Boolean, button can wake-up the system.
27+
- linux,can-disable: Boolean, indicates that button is connected
28+
to dedicated (not shared) interrupt which can be disabled to
29+
suppress events from the button.
2630

2731
Example nodes:
2832

‎Documentation/devicetree/bindings/input/stmpe-keypad.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Optional properties:
88
- debounce-interval : Debouncing interval time in milliseconds
99
- st,scan-count : Scanning cycles elapsed before key data is updated
1010
- st,no-autorepeat : If specified device will not autorepeat
11+
- keypad,num-rows : See ./matrix-keymap.txt
12+
- keypad,num-columns : See ./matrix-keymap.txt
1113

1214
Example:
1315

‎Documentation/networking/ip-sysctl.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ fwmark_reflect - BOOLEAN
6666
route/max_size - INTEGER
6767
Maximum number of routes allowed in the kernel. Increase
6868
this when using large numbers of interfaces and/or routes.
69+
From linux kernel 3.6 onwards, this is deprecated for ipv4
70+
as route cache is no longer used.
6971

7072
neigh/default/gc_thresh1 - INTEGER
7173
Minimum number of entries to keep. Garbage collector will not

‎Documentation/target/tcm_mod_builder.py

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
389389
buf += " .release_cmd = " + fabric_mod_name + "_release_cmd,\n"
390390
buf += " .shutdown_session = " + fabric_mod_name + "_shutdown_session,\n"
391391
buf += " .close_session = " + fabric_mod_name + "_close_session,\n"
392-
buf += " .stop_session = " + fabric_mod_name + "_stop_session,\n"
393-
buf += " .fall_back_to_erl0 = " + fabric_mod_name + "_reset_nexus,\n"
394-
buf += " .sess_logged_in = " + fabric_mod_name + "_sess_logged_in,\n"
395392
buf += " .sess_get_index = " + fabric_mod_name + "_sess_get_index,\n"
396393
buf += " .sess_get_initiator_sid = NULL,\n"
397394
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):
402399
buf += " .queue_data_in = " + fabric_mod_name + "_queue_data_in,\n"
403400
buf += " .queue_status = " + fabric_mod_name + "_queue_status,\n"
404401
buf += " .queue_tm_rsp = " + fabric_mod_name + "_queue_tm_rsp,\n"
405-
buf += " .is_state_remove = " + fabric_mod_name + "_is_state_remove,\n"
402+
buf += " .aborted_task = " + fabric_mod_name + "_aborted_task,\n"
406403
buf += " /*\n"
407404
buf += " * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"
408405
buf += " */\n"
@@ -428,7 +425,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
428425
buf += " /*\n"
429426
buf += " * Register the top level struct config_item_type with TCM core\n"
430427
buf += " */\n"
431-
buf += " fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name[4:] + "\");\n"
428+
buf += " fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name + "\");\n"
432429
buf += " if (IS_ERR(fabric)) {\n"
433430
buf += " printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\n"
434431
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):
595592
if re.search('get_fabric_name', fo):
596593
buf += "char *" + fabric_mod_name + "_get_fabric_name(void)\n"
597594
buf += "{\n"
598-
buf += " return \"" + fabric_mod_name[4:] + "\";\n"
595+
buf += " return \"" + fabric_mod_name + "\";\n"
599596
buf += "}\n\n"
600597
bufi += "char *" + fabric_mod_name + "_get_fabric_name(void);\n"
601598
continue
@@ -820,27 +817,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
820817
buf += "}\n\n"
821818
bufi += "void " + fabric_mod_name + "_close_session(struct se_session *);\n"
822819

823-
if re.search('stop_session\)\(', fo):
824-
buf += "void " + fabric_mod_name + "_stop_session(struct se_session *se_sess, int sess_sleep , int conn_sleep)\n"
825-
buf += "{\n"
826-
buf += " return;\n"
827-
buf += "}\n\n"
828-
bufi += "void " + fabric_mod_name + "_stop_session(struct se_session *, int, int);\n"
829-
830-
if re.search('fall_back_to_erl0\)\(', fo):
831-
buf += "void " + fabric_mod_name + "_reset_nexus(struct se_session *se_sess)\n"
832-
buf += "{\n"
833-
buf += " return;\n"
834-
buf += "}\n\n"
835-
bufi += "void " + fabric_mod_name + "_reset_nexus(struct se_session *);\n"
836-
837-
if re.search('sess_logged_in\)\(', fo):
838-
buf += "int " + fabric_mod_name + "_sess_logged_in(struct se_session *se_sess)\n"
839-
buf += "{\n"
840-
buf += " return 0;\n"
841-
buf += "}\n\n"
842-
bufi += "int " + fabric_mod_name + "_sess_logged_in(struct se_session *);\n"
843-
844820
if re.search('sess_get_index\)\(', fo):
845821
buf += "u32 " + fabric_mod_name + "_sess_get_index(struct se_session *se_sess)\n"
846822
buf += "{\n"
@@ -898,19 +874,18 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
898874
bufi += "int " + fabric_mod_name + "_queue_status(struct se_cmd *);\n"
899875

900876
if re.search('queue_tm_rsp\)\(', fo):
901-
buf += "int " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *se_cmd)\n"
877+
buf += "void " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *se_cmd)\n"
902878
buf += "{\n"
903-
buf += " return 0;\n"
879+
buf += " return;\n"
904880
buf += "}\n\n"
905-
bufi += "int " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n"
881+
bufi += "void " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n"
906882

907-
if re.search('is_state_remove\)\(', fo):
908-
buf += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *se_cmd)\n"
883+
if re.search('aborted_task\)\(', fo):
884+
buf += "void " + fabric_mod_name + "_aborted_task(struct se_cmd *se_cmd)\n"
909885
buf += "{\n"
910-
buf += " return 0;\n"
886+
buf += " return;\n"
911887
buf += "}\n\n"
912-
bufi += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *);\n"
913-
888+
bufi += "void " + fabric_mod_name + "_aborted_task(struct se_cmd *);\n"
914889

915890
ret = p.write(buf)
916891
if ret:
@@ -1018,11 +993,11 @@ def main(modname, proto_ident):
1018993
tcm_mod_build_kbuild(fabric_mod_dir, fabric_mod_name)
1019994
tcm_mod_build_kconfig(fabric_mod_dir, fabric_mod_name)
1020995

1021-
input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Makefile..? [yes,no]: ")
996+
input = raw_input("Would you like to add " + fabric_mod_name + " to drivers/target/Makefile..? [yes,no]: ")
1022997
if input == "yes" or input == "y":
1023998
tcm_mod_add_kbuild(tcm_dir, fabric_mod_name)
1024999

1025-
input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Kconfig..? [yes,no]: ")
1000+
input = raw_input("Would you like to add " + fabric_mod_name + " to drivers/target/Kconfig..? [yes,no]: ")
10261001
if input == "yes" or input == "y":
10271002
tcm_mod_add_kconfig(tcm_dir, fabric_mod_name)
10281003

‎Documentation/thermal/cpu-cooling-api.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CPU cooling APIs How To
33

44
Written by Amit Daniel Kachhap <[email protected]>
55

6-
Updated: 12 May 2012
6+
Updated: 6 Jan 2015
77

88
Copyright (c) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com)
99

@@ -25,7 +25,18 @@ the user. The registration APIs returns the cooling device pointer.
2525

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

28-
1.1.2 void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
28+
1.1.2 struct thermal_cooling_device *of_cpufreq_cooling_register(
29+
struct device_node *np, const struct cpumask *clip_cpus)
30+
31+
This interface function registers the cpufreq cooling device with
32+
the name "thermal-cpufreq-%x" linking it with a device tree node, in
33+
order to bind it via the thermal DT code. This api can support multiple
34+
instances of cpufreq cooling devices.
35+
36+
np: pointer to the cooling device device tree node
37+
clip_cpus: cpumask of cpus where the frequency constraints will happen.
38+
39+
1.1.3 void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
2940

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

‎MAINTAINERS

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -724,15 +724,15 @@ F: include/uapi/linux/apm_bios.h
724724
F: drivers/char/apm-emulation.c
725725

726726
APPLE BCM5974 MULTITOUCH DRIVER
727-
M: Henrik Rydberg <rydberg@euromail.se>
727+
M: Henrik Rydberg <rydberg@bitmath.org>
728728
L: [email protected]
729-
S: Maintained
729+
S: Odd fixes
730730
F: drivers/input/mouse/bcm5974.c
731731

732732
APPLE SMC DRIVER
733-
M: Henrik Rydberg <rydberg@euromail.se>
733+
M: Henrik Rydberg <rydberg@bitmath.org>
734734
L: [email protected]
735-
S: Maintained
735+
S: Odd fixes
736736
F: drivers/hwmon/applesmc.c
737737

738738
APPLETALK NETWORK LAYER
@@ -2259,6 +2259,7 @@ F: drivers/gpio/gpio-bt8xx.c
22592259
BTRFS FILE SYSTEM
22602260
M: Chris Mason <[email protected]>
22612261
M: Josef Bacik <[email protected]>
2262+
M: David Sterba <[email protected]>
22622263
L: [email protected]
22632264
W: http://btrfs.wiki.kernel.org/
22642265
Q: http://patchwork.kernel.org/project/linux-btrfs/list/
@@ -3182,7 +3183,7 @@ L: [email protected]
31823183
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
31833184
S: Maintained
31843185
F: drivers/dma/
3185-
F: include/linux/dma*
3186+
F: include/linux/dmaengine.h
31863187
F: Documentation/dmaengine/
31873188
T: git git://git.infradead.org/users/vkoul/slave-dma.git
31883189

@@ -4748,7 +4749,7 @@ S: Supported
47484749
F: drivers/scsi/ipr.*
47494750

47504751
IBM Power Virtual Ethernet Device Driver
4751-
M: Santiago Leon <santil@linux.vnet.ibm.com>
4752+
M: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
47524753
L: [email protected]
47534754
S: Supported
47544755
F: drivers/net/ethernet/ibm/ibmveth.*
@@ -4940,10 +4941,10 @@ F: include/uapi/linux/input.h
49404941
F: include/linux/input/
49414942

49424943
INPUT MULTITOUCH (MT) PROTOCOL
4943-
M: Henrik Rydberg <rydberg@euromail.se>
4944+
M: Henrik Rydberg <rydberg@bitmath.org>
49444945
L: [email protected]
49454946
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
4946-
S: Maintained
4947+
S: Odd fixes
49474948
F: Documentation/input/multi-touch-protocol.txt
49484949
F: drivers/input/input-mt.c
49494950
K: \b(ABS|SYN)_MT_
@@ -5279,6 +5280,15 @@ W: www.open-iscsi.org
52795280
Q: http://patchwork.kernel.org/project/linux-rdma/list/
52805281
F: drivers/infiniband/ulp/iser/
52815282

5283+
ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
5284+
M: Sagi Grimberg <[email protected]>
5285+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
5286+
L: [email protected]
5287+
L: [email protected]
5288+
S: Supported
5289+
W: http://www.linux-iscsi.org
5290+
F: drivers/infiniband/ulp/isert
5291+
52825292
ISDN SUBSYSTEM
52835293
M: Karsten Keil <[email protected]>
52845294
L: [email protected] (subscribers-only)
@@ -7737,8 +7747,7 @@ F: Documentation/scsi/LICENSE.qla2xxx
77377747
F: drivers/scsi/qla2xxx/
77387748

77397749
QLOGIC QLA4XXX iSCSI DRIVER
7740-
M: Vikas Chaudhary <[email protected]>
7741-
M: [email protected]
7750+
M: [email protected]
77427751
L: [email protected]
77437752
S: Supported
77447753
F: Documentation/scsi/LICENSE.qla4xxx
@@ -9533,7 +9542,8 @@ F: drivers/platform/x86/thinkpad_acpi.c
95339542
TI BANDGAP AND THERMAL DRIVER
95349543
M: Eduardo Valentin <[email protected]>
95359544
L: [email protected]
9536-
S: Supported
9545+
L: [email protected]
9546+
S: Maintained
95379547
F: drivers/thermal/ti-soc-thermal/
95389548

95399549
TI CLOCK DRIVER

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 19
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc2
4+
EXTRAVERSION = -rc5
55
NAME = Diseased Newt
66

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

‎arch/arm/boot/dts/armada-370-db.dts

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -203,27 +203,3 @@
203203
compatible = "linux,spdif-dir";
204204
};
205205
};
206-
207-
&pinctrl {
208-
/*
209-
* These pins might be muxed as I2S by
210-
* the bootloader, but it conflicts
211-
* with the real I2S pins that are
212-
* muxed using i2s_pins. We must mux
213-
* those pins to a function other than
214-
* I2S.
215-
*/
216-
pinctrl-0 = <&hog_pins1 &hog_pins2>;
217-
pinctrl-names = "default";
218-
219-
hog_pins1: hog-pins1 {
220-
marvell,pins = "mpp6", "mpp8", "mpp10",
221-
"mpp12", "mpp13";
222-
marvell,function = "gpio";
223-
};
224-
225-
hog_pins2: hog-pins2 {
226-
marvell,pins = "mpp5", "mpp7", "mpp9";
227-
marvell,function = "gpo";
228-
};
229-
};

‎arch/arm/boot/dts/at91sam9263.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,8 @@
953953
interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;
954954
pinctrl-names = "default";
955955
pinctrl-0 = <&pinctrl_fb>;
956+
clocks = <&lcd_clk>, <&lcd_clk>;
957+
clock-names = "lcdc_clk", "hclk";
956958
status = "disabled";
957959
};
958960

‎arch/arm/boot/dts/berlin2q-marvell-dmp.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
};
6666

6767
&sdhci2 {
68+
broken-cd;
69+
bus-width = <8>;
6870
non-removable;
6971
status = "okay";
7072
};

0 commit comments

Comments
 (0)