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

Unverified Commit dc299773 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.289 kernel 

Changes in 4.4.289: (19 commits)
        USB: cdc-acm: fix racy tty buffer accesses
        USB: cdc-acm: fix break reporting
        nfsd4: Handle the NFSv4 READDIR 'dircount' hint being zero
        xtensa: call irqchip_init only when CONFIG_USE_OF is selected
        phy: mdio: fix memory leak
        net_sched: fix NULL deref in fifo_set_limit()
        ptp_pch: Load module automatically if ID matches
        ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
        netlink: annotate data races around nlk->bound
        i40e: fix endless loop under rtnl
        gup: document and work around "COW can break either way" issue
        mm: check VMA flags to avoid invalid PROT_NONE NUMA balancing
        HID: apple: Fix logical maximum and usage maximum of Magic Keyboard JIS
        netfilter: ip6_tables: zero-initialize fragment offset
        mac80211: Drop frames from invalid MAC address in ad-hoc mode
        scsi: ses: Fix unsigned comparison with less than zero
        scsi: virtio_scsi: Fix spelling mistake "Unsupport" -> "Unsupported"
        perf/x86: Reset destroy callback on event init failure
        Linux 4.4.289
parents 464c5b7a c67099a5

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 288

SUBLEVEL = 289

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/mach-imx/pm-imx6.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/io.h>

#include <linux/irq.h>

#include <linux/genalloc.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <linux/of.h>
@@ -604,6 +605,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata 


static void imx6_pm_stby_poweroff(void)

{

	gic_cpu_if_down(0);

	imx6_set_lpm(STOP_POWER_OFF);

	imx6q_suspend_finish(0);

arch/x86/kernel/cpu/perf_event.c

+1 −0
Original line number Diff line number Diff line
@@ -2001,6 +2001,7 @@ static int x86_pmu_event_init(struct perf_event *event) 
	if (err) {

		if (event->destroy)

			event->destroy(event);

		event->destroy = NULL;

	}



	if (ACCESS_ONCE(x86_pmu.attr_rdpmc))

arch/xtensa/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ unsigned xtensa_get_ext_irq_no(unsigned irq) 


void __init init_IRQ(void)

{

#ifdef CONFIG_OF

#ifdef CONFIG_USE_OF

	irqchip_init();

#else

#ifdef CONFIG_HAVE_SMP

drivers/hid/hid-apple.c

+7 −0
Original line number Diff line number Diff line
@@ -301,12 +301,19 @@ static int apple_event(struct hid_device *hdev, struct hid_field *field, 


/*

 * MacBook JIS keyboard has wrong logical maximum

 * Magic Keyboard JIS has wrong logical maximum

 */

static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	struct apple_sc *asc = hid_get_drvdata(hdev);



	if(*rsize >=71 && rdesc[70] == 0x65 && rdesc[64] == 0x65) {

		hid_info(hdev,

			 "fixing up Magic Keyboard JIS report descriptor\n");

		rdesc[64] = rdesc[70] = 0xe7;

	}



	if ((asc->quirks & APPLE_RDESC_JIS) && *rsize >= 60 &&

			rdesc[53] == 0x65 && rdesc[59] == 0x65) {

		hid_info(hdev,