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

Unverified Commit 91ad97f1 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.290 kernel 

Changes in 4.4.289: (44 commits)
        ALSA: seq: Fix a potential UAF by wrong private_free call order
        s390: fix strrchr() implementation
        xhci: Enable trust tx length quirk for Fresco FL11 USB controller
        cb710: avoid NULL pointer subtraction
        efi/cper: use stack buffer for error record decoding
        Input: xpad - add support for another USB ID of Nacon GC-100
        USB: serial: qcserial: add EM9191 QDL support
        USB: serial: option: add Telit LE910Cx composition 0x1204
        nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells
        iio: adc128s052: Fix the error handling path of 'adc128_probe()'
        iio: ssp_sensors: add more range checking in ssp_parse_dataframe()
        iio: ssp_sensors: fix error code in ssp_print_mcu_debug()
        net: arc: select CRC32
        net: korina: select CRC32
        net: encx24j600: check error in devm_regmap_init_encx24j600
        ethernet: s2io: fix setting mac address during resume
        nfc: fix error handling of nfc_proto_register()
        NFC: digital: fix possible memory leak in digital_tg_listen_mdaa()
        NFC: digital: fix possible memory leak in digital_in_send_sdd_req()
        pata_legacy: fix a couple uninitialized variable bugs
        drm/msm: Fix null pointer dereference on pointer edp
        r8152: select CRC32 and CRYPTO/CRYPTO_HASH/CRYPTO_SHA256
        NFSD: Keep existing listeners on portlist error
        netfilter: ipvs: make global sysctl readonly in non-init netns
        NIOS2: irqflags: rename a redefined register name
        can: rcar_can: fix suspend/resume
        can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification
        can: peak_pci: peak_pci_remove(): fix UAF
        ocfs2: mount fails with buffer overflow in strlen
        elfcore: correct reference to CONFIG_UML
        ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset
        ASoC: DAPM: Fix missing kctl change notifications
        ovl: fix missing negative dentry check in ovl_rename()
        nfc: nci: fix the UAF of rf_conn_info object
        isdn: cpai: check ctr->cnr to avoid array index out of bound
        netfilter: Kconfig: use 'default y' instead of 'm' for bool config option
        ARM: dts: spear3xx: Fix gmac node
        isdn: mISDN: Fix sleeping function called from invalid context
        platform/x86: intel_scu_ipc: Update timeout value in comment
        ALSA: hda: avoid write to STATESTS if controller is in reset
        net: mdiobus: Fix memory leak in __mdiobus_register
        tracing: Have all levels of checks prevent recursion
        ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
        Linux 4.4.290
parents dc299773 7e1cc0d9

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 289

SUBLEVEL = 290

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ config ARM 
	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)

	select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)

	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))

	select HAVE_IDE if PCI || ISA || PCMCIA

arch/arm/boot/dts/spear3xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
		};



		gmac: eth@e0800000 {

			compatible = "st,spear600-gmac";

			compatible = "snps,dwmac-3.40a";

			reg = <0xe0800000 0x8000>;

			interrupts = <23 22>;

			interrupt-names = "macirq", "eth_wake_irq";

arch/nios2/include/asm/irqflags.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


static inline unsigned long arch_local_save_flags(void)

{

	return RDCTL(CTL_STATUS);

	return RDCTL(CTL_FSTATUS);

}



/*
@@ -31,7 +31,7 @@ static inline unsigned long arch_local_save_flags(void) 
 */

static inline void arch_local_irq_restore(unsigned long flags)

{

	WRCTL(CTL_STATUS, flags);

	WRCTL(CTL_FSTATUS, flags);

}



static inline void arch_local_irq_disable(void)

arch/nios2/include/asm/registers.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#endif



/* control register numbers */

#define CTL_STATUS	0

#define CTL_FSTATUS	0

#define CTL_ESTATUS	1

#define CTL_BSTATUS	2

#define CTL_IENABLE	3