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

Unverified Commit 82e499ff authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.254 kernel 

Changes in 4.4.254: (25 commits)
        ALSA: seq: oss: Fix missing error check in snd_seq_oss_synth_make_info()
        ALSA: hda/via: Add minimum mute flag
        ACPI: scan: Make acpi_bus_get_device() clear return pointer on error
        dm: avoid filesystem lookup in dm_get_dev_t()
        ASoC: Intel: haswell: Add missing pm_ops
        scsi: ufs: Correct the LUN used in eh_device_reset_handler() callback
        drm/nouveau/bios: fix issue shadowing expansion ROMs
        drm/nouveau/i2c/gm200: increase width of aux semaphore owner fields
        can: dev: can_restart: fix use after free bug
        iio: ad5504: Fix setting power-down state
        ehci: fix EHCI host controller initialization sequence
        usb: bdc: Make bdc pci driver depend on BROKEN
        xhci: make sure TRB is fully written before giving it to the controller
        compiler.h: Raise minimum version of GCC to 5.1 for arm64
        netfilter: rpfilter: mask ecn bits before fib lookup
        sh: dma: fix kconfig dependency for G2_DMA
        sh_eth: Fix power down vs. is_opened flag ordering
        skbuff: back tiny skbs with kmalloc() in __netdev_alloc_skb() too
        ipv6: create multicast route with RTPROT_KERNEL
        net_sched: avoid shift-out-of-bounds in tcindex_set_parms()
        Revert "mm/slub: fix a memory leak in sysfs_slab_add()"
        tracing: Fix race in trace_open and buffer resize call
        xen-blkback: set ring->xenblkd to NULL after kthread_stop()
        x86/boot/compressed: Disable relocation relaxation
        Linux 4.4.254

Conflicts:
	drivers/scsi/ufs/ufshcd.c
	net/core/skbuff.c
parents c51daea6 65554cac

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 253

SUBLEVEL = 254

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/sh/drivers/dma/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ config PVR2_DMA 


config G2_DMA

	tristate "G2 Bus DMA support"

	depends on SH_DREAMCAST

	select SH_DMA_API

	depends on SH_DREAMCAST && SH_DMA_API

	help

	  This enables support for the DMA controller for the Dreamcast's

	  G2 bus. Drivers that want this will generally enable this on

arch/x86/boot/compressed/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ KBUILD_CFLAGS += -mno-mmx -mno-sse 
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

# Disable relocation relaxation in case the link is not PIE.

KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no)



KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n

drivers/acpi/scan.c

+2 −0
Original line number Diff line number Diff line
@@ -564,6 +564,8 @@ static int acpi_get_device_data(acpi_handle handle, struct acpi_device **device, 
	if (!device)

		return -EINVAL;



	*device = NULL;



	status = acpi_get_data_full(handle, acpi_scan_drop_device,

				    (void **)device, callback);

	if (ACPI_FAILURE(status) || !*device) {

drivers/block/xen-blkback/xenbus.c

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif) 


	if (blkif->xenblkd) {

		kthread_stop(blkif->xenblkd);

		blkif->xenblkd = NULL;

		wake_up(&blkif->shutdown_wq);

	}