Re: Linux 4.9.41
diff --git a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
index 3e5b9793341f..8682ab6d4a50 100644
--- a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
+++ b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
@@ -8,8 +8,9 @@ This driver provides a simple power button event via an
Interrupt.
Required properties:
- compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"
-Required properties for TPS65218:
+Required properties:
- interrupts: should be one of the following
+ - <2>: For controllers compatible with tps65217
- <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218
Examples:
@@ -17,6 +18,7 @@ Examples:
{
tps65217-pwrbutton {
compatible = "ti,tps65217-pwrbutton";
+ interrupts = <2>;
};
};
diff --git
a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
index 98d131acee95..a11072c5a866 100644
--- a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
+++ b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
@@ -2,11 +2,16 @@ TPS65217 Charger
Required Properties:
-compatible: "ti,tps65217-charger"
+-interrupts: TPS65217 interrupt numbers for the AC and USB charger input
change.
+ Should be <0> for the USB charger and <1> for the AC adapter.
+-interrupt-names: Should be "USB" and "AC"
This node is a subnode of the tps65217 PMIC.
Example:
tps65217-charger {
- compatible = "ti,tps65090-charger";
+ compatible = "ti,tps65217-charger";
+ interrupts = <0>, <1>;
+ interrupt-names = "USB", "AC";
};
diff --git a/Makefile b/Makefile
index d9397a912c31..82eb3d1ee801 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 9
-SUBLEVEL = 40
+SUBLEVEL = 41
EXTRAVERSION =
NAME = Roaring Lionus
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c
index f39142acc89e..be131b296a55 100644
--- a/arch/arc/kernel/mcip.c
+++ b/arch/arc/kernel/mcip.c
@@ -10,6 +10,7 @@
#include
#include
+#include
#include
#include
#include
@@ -221,10 +222,13 @@ static irq_hw_number_t idu_first_hwirq;
static void idu_cascade_isr(struct irq_desc *desc)
{
struct irq_domain *idu_domain = irq_desc_get_handler_data(desc);
+ struct irq_chip *core_chip = irq_desc_get_chip(desc);
irq_hw_number_t core_hwirq = irqd_to_hwirq(irq_desc_get_irq_data(desc));
irq_hw_number_t idu_hwirq = core_hwirq - idu_first_hwirq;
+ chained_irq_enter(core_chip, desc);
generic_handle_irq(irq_find_mapping(idu_domain, idu_hwirq));
+ chained_irq_exit(core_chip, desc);
}
static int idu_irq_map(struct irq_domain *d, unsigned int virq,
irq_hw_number_t hwirq)
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi
b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 03cec62260e1..db858fff4e18 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -294,7 +294,7 @@
};
{
- dr_mode = "otg";
+ dr_mode = "peripheral";
};
{
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 87ca50b53002..4d448f145ed1 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -734,6 +734,8 @@
vmmc_aux-supply = <>;
bus-width = <8>;
non-removable;
+ no-sdio;
+ no-sd;
};
{
diff --git a/arch/arm/configs/s3c2410_defconfig
b/arch/arm/configs/s3c2410_defconfig
index bc4bfe02e611..60d3fecd7a22 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -86,9 +86,9 @@ CONFIG_IPV6_TUNNEL=m
CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 1052b29697b8..b5c1714ebfdd 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -790,14 +790,14 @@ static int _init_main_clk(struct omap_hwmod *oh)
int ret = 0;
char name[MOD_CLK_MAX_NAME_LEN];
struct clk *clk;
+ static const char modck[] = "_mod_ck";
- /* +7 magic comes from '_mod_ck' suffix */
- if (strlen(oh->name) + 7 > MOD_CLK_MAX_NAME_LEN)
+ if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck))
pr_warn("%s: warning: cropping name for %s\n", __func__,
oh->name);
- strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 7);
- strcat(name, "_mod_ck");
+
Re: Linux 4.9.41
diff --git a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
index 3e5b9793341f..8682ab6d4a50 100644
--- a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
+++ b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
@@ -8,8 +8,9 @@ This driver provides a simple power button event via an
Interrupt.
Required properties:
- compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"
-Required properties for TPS65218:
+Required properties:
- interrupts: should be one of the following
+ - <2>: For controllers compatible with tps65217
- <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218
Examples:
@@ -17,6 +18,7 @@ Examples:
{
tps65217-pwrbutton {
compatible = "ti,tps65217-pwrbutton";
+ interrupts = <2>;
};
};
diff --git
a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
index 98d131acee95..a11072c5a866 100644
--- a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
+++ b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
@@ -2,11 +2,16 @@ TPS65217 Charger
Required Properties:
-compatible: "ti,tps65217-charger"
+-interrupts: TPS65217 interrupt numbers for the AC and USB charger input
change.
+ Should be <0> for the USB charger and <1> for the AC adapter.
+-interrupt-names: Should be "USB" and "AC"
This node is a subnode of the tps65217 PMIC.
Example:
tps65217-charger {
- compatible = "ti,tps65090-charger";
+ compatible = "ti,tps65217-charger";
+ interrupts = <0>, <1>;
+ interrupt-names = "USB", "AC";
};
diff --git a/Makefile b/Makefile
index d9397a912c31..82eb3d1ee801 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 9
-SUBLEVEL = 40
+SUBLEVEL = 41
EXTRAVERSION =
NAME = Roaring Lionus
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c
index f39142acc89e..be131b296a55 100644
--- a/arch/arc/kernel/mcip.c
+++ b/arch/arc/kernel/mcip.c
@@ -10,6 +10,7 @@
#include
#include
+#include
#include
#include
#include
@@ -221,10 +222,13 @@ static irq_hw_number_t idu_first_hwirq;
static void idu_cascade_isr(struct irq_desc *desc)
{
struct irq_domain *idu_domain = irq_desc_get_handler_data(desc);
+ struct irq_chip *core_chip = irq_desc_get_chip(desc);
irq_hw_number_t core_hwirq = irqd_to_hwirq(irq_desc_get_irq_data(desc));
irq_hw_number_t idu_hwirq = core_hwirq - idu_first_hwirq;
+ chained_irq_enter(core_chip, desc);
generic_handle_irq(irq_find_mapping(idu_domain, idu_hwirq));
+ chained_irq_exit(core_chip, desc);
}
static int idu_irq_map(struct irq_domain *d, unsigned int virq,
irq_hw_number_t hwirq)
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi
b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 03cec62260e1..db858fff4e18 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -294,7 +294,7 @@
};
{
- dr_mode = "otg";
+ dr_mode = "peripheral";
};
{
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 87ca50b53002..4d448f145ed1 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -734,6 +734,8 @@
vmmc_aux-supply = <>;
bus-width = <8>;
non-removable;
+ no-sdio;
+ no-sd;
};
{
diff --git a/arch/arm/configs/s3c2410_defconfig
b/arch/arm/configs/s3c2410_defconfig
index bc4bfe02e611..60d3fecd7a22 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -86,9 +86,9 @@ CONFIG_IPV6_TUNNEL=m
CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 1052b29697b8..b5c1714ebfdd 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -790,14 +790,14 @@ static int _init_main_clk(struct omap_hwmod *oh)
int ret = 0;
char name[MOD_CLK_MAX_NAME_LEN];
struct clk *clk;
+ static const char modck[] = "_mod_ck";
- /* +7 magic comes from '_mod_ck' suffix */
- if (strlen(oh->name) + 7 > MOD_CLK_MAX_NAME_LEN)
+ if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck))
pr_warn("%s: warning: cropping name for %s\n", __func__,
oh->name);
- strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 7);
- strcat(name, "_mod_ck");
+
Linux 4.9.41
handler is registered x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev' Annie Cherkaev (1): isdn/i4l: fix buffer overflow Arnaldo Carvalho de Melo (2): perf tools: Install tools/lib/traceevent plugins with install-bin perf symbols: Robustify reading of build-id from sysfs Arnd Bergmann (1): vfio-pci: use 32-bit comparisons for register address for gcc-4.5 Arvind Yadav (2): video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap vfio-pci: Handle error from pci_iomap Ben Skeggs (1): drm/nouveau/bar/gf100: fix access to upper half of BAR2 Benjamin Coddington (1): NFSv4.1: Fix a race where CB_NOTIFY_LOCK fails to wake a waiter Benjamin Poirier (1): scsi: bfa: Increase requested firmware version to 3.2.5.1 Burak Ok (1): scsi: snic: Return error code on memory allocation failure Caleb Crome (1): ASoC: fsl_ssi: set fifo watermark to more reliable value Cheah Kok Cheong (1): Staging: comedi: comedi_fops: Avoid orphaned proc entry Christophe JAILLET (1): dmaengine: ti-dma-crossbar: Add some 'of_node_put()' in error path. Chun-Hao Lin (1): r8169: add support for RTL8168 series add-on card. Dan Williams (1): device-dax: fix sysfs duplicate warnings Daniel Bristot de Oliveira (1): tools lib traceevent: Fix prev/next_prio for deadline tasks Daniel Dadap (1): ALSA: hda - Add missing NVIDIA GPU codec IDs to patch table Daniel Schultz (1): nvmem: imx-ocotp: Fix wrong register size Dave Jiang (2): dmaengine: ioatdma: Add Skylake PCI Dev ID dmaengine: ioatdma: workaround SKX ioatdma version David Carrillo-Cisneros (1): perf/x86: Set pmu->module in Intel PMU modules David Lechner (1): usb: gadget: Fix copy/pasted error message Eric Dumazet (2): net: reduce skb_warn_bad_offload() noise net: skb_needs_check() accepts CHECKSUM_NONE for tx Florian Fainelli (1): net: phy: Do not perform software reset for Generic PHY Greg Kroah-Hartman (2): Revert "powerpc/numa: Fix percpu allocations to be NUMA aware" Linux 4.9.41 Grygorii Strashko (1): usb: dwc3: omap: fix race of pm runtime with irq handler in probe Guillaume Nault (1): l2tp: consider '::' as wildcard address in l2tp_ip6 socket lookup Helge Deller (1): parisc: Suspend lockup detectors before system halt Herbert Xu (1): crypto: authencesn - Fix digest_null crash Ilia Mirkin (1): drm/nouveau/disp/nv50-: bump max chans to 21 Ioan-Adrian Ratiu (1): ALSA: usb-audio: test EP_FLAG_RUNNING at urb completion Ismail, Mustafa (1): RDMA/uverbs: Fix the check for port number Jack Morgenstein (2): net/mlx4_core: Use-after-free causes a resource leak in flow-steering detach net/mlx4_core: Fix raw qp flow steering rules under SRIOV Jan Kara (1): jfs: Don't clear SGID when inheriting ACLs Jeeja KP (1): ASoC: Intel: Skylake: Release FW ctx in cleanup Jia-Ju Bai (1): isdn: Fix a sleep-in-atomic bug Jiandi An (1): Xen: ARM: Zero reserved fields of xatp before making hypervisor call Jiri Kosina (1): HID: ignore Petzl USB headlamp Joel Fernandes (2): pstore: Make spinlock per zone instead of global pstore: Allow prz to control need for locking John David Anglin (2): parisc: Prevent TLB speculation on flushed pages on CPUs that only support equivalent aliases parisc: Extend disabled preemption in copy_user_page John Hsu (1): ASoC: nau8825: fix invalid configuration in Pre-Scalar of FLL Jordan Crouse (3): drm/msm: Ensure that the hardware write pointer is valid drm/msm: Put back the vaddr in submit_reloc() drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set Kees Cook (2): pstore: Correctly initialize spinlock and flags pstore: Use dynamic spinlock initializer Konstantin Khlebnikov (1): sched/cgroup: Move sched_online_group() back into css_online() to fix crash Krzysztof Kozlowski (1): ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_* Laurent Pinchart (1): drm: rcar-du: Simplify and fix probe error handling Laurent Vivier (1): powerpc/pseries: Fix of_node_put() underflow during reconfig remove Leon Romanovsky (1): net/mlx4: Remove BUG_ON from ICM allocation routine Lior David (1): wil6210: fix deadlock when using fw_no_recovery option Liu Bo (3): Btrfs: use down_read_nested to make lockdep silent Btrfs: fix lockdep warning about log_mutex Btrfs: adjust outstanding_extents counter properly when dio write is split Maninder Singh (1): ARM: omap2+: fixing wrong strcat for Non-NULL terminated string Mark Rutland (1): arm64: mm: fix show_pte KERN_CONT fallout Masami Hiramatsu (1): perf probe: Fix to get correct modname from elf header Michal Kazior (1): ath10k: fix null deref on wmi-tlv when trying spectral scan Michal Simek (1)
Linux 4.9.41
handler is registered x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev' Annie Cherkaev (1): isdn/i4l: fix buffer overflow Arnaldo Carvalho de Melo (2): perf tools: Install tools/lib/traceevent plugins with install-bin perf symbols: Robustify reading of build-id from sysfs Arnd Bergmann (1): vfio-pci: use 32-bit comparisons for register address for gcc-4.5 Arvind Yadav (2): video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap vfio-pci: Handle error from pci_iomap Ben Skeggs (1): drm/nouveau/bar/gf100: fix access to upper half of BAR2 Benjamin Coddington (1): NFSv4.1: Fix a race where CB_NOTIFY_LOCK fails to wake a waiter Benjamin Poirier (1): scsi: bfa: Increase requested firmware version to 3.2.5.1 Burak Ok (1): scsi: snic: Return error code on memory allocation failure Caleb Crome (1): ASoC: fsl_ssi: set fifo watermark to more reliable value Cheah Kok Cheong (1): Staging: comedi: comedi_fops: Avoid orphaned proc entry Christophe JAILLET (1): dmaengine: ti-dma-crossbar: Add some 'of_node_put()' in error path. Chun-Hao Lin (1): r8169: add support for RTL8168 series add-on card. Dan Williams (1): device-dax: fix sysfs duplicate warnings Daniel Bristot de Oliveira (1): tools lib traceevent: Fix prev/next_prio for deadline tasks Daniel Dadap (1): ALSA: hda - Add missing NVIDIA GPU codec IDs to patch table Daniel Schultz (1): nvmem: imx-ocotp: Fix wrong register size Dave Jiang (2): dmaengine: ioatdma: Add Skylake PCI Dev ID dmaengine: ioatdma: workaround SKX ioatdma version David Carrillo-Cisneros (1): perf/x86: Set pmu->module in Intel PMU modules David Lechner (1): usb: gadget: Fix copy/pasted error message Eric Dumazet (2): net: reduce skb_warn_bad_offload() noise net: skb_needs_check() accepts CHECKSUM_NONE for tx Florian Fainelli (1): net: phy: Do not perform software reset for Generic PHY Greg Kroah-Hartman (2): Revert "powerpc/numa: Fix percpu allocations to be NUMA aware" Linux 4.9.41 Grygorii Strashko (1): usb: dwc3: omap: fix race of pm runtime with irq handler in probe Guillaume Nault (1): l2tp: consider '::' as wildcard address in l2tp_ip6 socket lookup Helge Deller (1): parisc: Suspend lockup detectors before system halt Herbert Xu (1): crypto: authencesn - Fix digest_null crash Ilia Mirkin (1): drm/nouveau/disp/nv50-: bump max chans to 21 Ioan-Adrian Ratiu (1): ALSA: usb-audio: test EP_FLAG_RUNNING at urb completion Ismail, Mustafa (1): RDMA/uverbs: Fix the check for port number Jack Morgenstein (2): net/mlx4_core: Use-after-free causes a resource leak in flow-steering detach net/mlx4_core: Fix raw qp flow steering rules under SRIOV Jan Kara (1): jfs: Don't clear SGID when inheriting ACLs Jeeja KP (1): ASoC: Intel: Skylake: Release FW ctx in cleanup Jia-Ju Bai (1): isdn: Fix a sleep-in-atomic bug Jiandi An (1): Xen: ARM: Zero reserved fields of xatp before making hypervisor call Jiri Kosina (1): HID: ignore Petzl USB headlamp Joel Fernandes (2): pstore: Make spinlock per zone instead of global pstore: Allow prz to control need for locking John David Anglin (2): parisc: Prevent TLB speculation on flushed pages on CPUs that only support equivalent aliases parisc: Extend disabled preemption in copy_user_page John Hsu (1): ASoC: nau8825: fix invalid configuration in Pre-Scalar of FLL Jordan Crouse (3): drm/msm: Ensure that the hardware write pointer is valid drm/msm: Put back the vaddr in submit_reloc() drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set Kees Cook (2): pstore: Correctly initialize spinlock and flags pstore: Use dynamic spinlock initializer Konstantin Khlebnikov (1): sched/cgroup: Move sched_online_group() back into css_online() to fix crash Krzysztof Kozlowski (1): ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_* Laurent Pinchart (1): drm: rcar-du: Simplify and fix probe error handling Laurent Vivier (1): powerpc/pseries: Fix of_node_put() underflow during reconfig remove Leon Romanovsky (1): net/mlx4: Remove BUG_ON from ICM allocation routine Lior David (1): wil6210: fix deadlock when using fw_no_recovery option Liu Bo (3): Btrfs: use down_read_nested to make lockdep silent Btrfs: fix lockdep warning about log_mutex Btrfs: adjust outstanding_extents counter properly when dio write is split Maninder Singh (1): ARM: omap2+: fixing wrong strcat for Non-NULL terminated string Mark Rutland (1): arm64: mm: fix show_pte KERN_CONT fallout Masami Hiramatsu (1): perf probe: Fix to get correct modname from elf header Michal Kazior (1): ath10k: fix null deref on wmi-tlv when trying spectral scan Michal Simek (1)
