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

Unverified Commit 8e3bef04 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.251 kernel 

Changes in 4.4.251: (38 commits)
        kbuild: don't hardcode depmod path
        workqueue: Kick a worker based on the actual activation of delayed works
        lib/genalloc: fix the overflow when size is too big
        depmod: handle the case of /sbin/depmod without /sbin in PATH
        atm: idt77252: call pci_disable_device() on error path
        ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
        net: hns: fix return value check in __lb_other_process()
        net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
        CDC-NCM: remove "connected" log message
        vhost_net: fix ubuf refcount incorrectly when sendmsg fails
        net: sched: prevent invalid Scell_log shift count
        virtio_net: Fix recursive call to cpus_read_lock()
        ethernet: ucc_geth: fix use-after-free in ucc_geth_remove()
        video: hyperv_fb: Fix the mmap() regression for v5.4.y and older
        usb: gadget: enable super speed plus
        USB: cdc-acm: blacklist another IR Droid device
        usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data()
        USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set
        usb: uas: Add PNY USB Portable SSD to unusual_uas
        USB: serial: iuu_phoenix: fix DMA from stack
        USB: serial: option: add LongSung M5710 module support
        USB: yurex: fix control-URB timeout handling
        USB: usblp: fix DMA to stack
        ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks
        usb: gadget: select CONFIG_CRC32
        usb: gadget: f_uac2: reset wMaxPacketSize
        usb: gadget: function: printer: Fix a memory leak for interface descriptor
        USB: gadget: legacy: fix return error code in acm_ms_bind()
        usb: gadget: Fix spinlock lockup on usb_function_deactivate
        usb: gadget: configfs: Preserve function ordering after bind failure
        USB: serial: keyspan_pda: remove unused variable
        x86/mm: Fix leak of pmd ptlock
        ALSA: hda/conexant: add a new hda codec CX11970
        Revert "device property: Keep secondary firmware node secondary by type"
        netfilter: ipset: fix shift-out-of-bounds in htable_bits()
        netfilter: xt_RATEEST: reject non-null terminated string from userspace
        x86/mtrr: Correct the range check before performing MTRR type lookups
        Linux 4.4.251

Conflicts:
	drivers/usb/gadget/function/f_uac2.c
parents a94fbd79 5df68d94

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 250

SUBLEVEL = 251

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -349,7 +349,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump 
AWK		= awk

GENKSYMS	= scripts/genksyms/genksyms

INSTALLKERNEL  := installkernel

DEPMOD		= /sbin/depmod

DEPMOD		= depmod

PERL		= perl

PYTHON		= python

CHECK		= sparse

arch/x86/kernel/cpu/mtrr/generic.c

+3 −3
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ static u8 mtrr_type_lookup_variable(u64 start, u64 end, u64 *partial_end, 
	*repeat = 0;

	*uniform = 1;



	/* Make end inclusive instead of exclusive */

	end--;



	prev_match = MTRR_TYPE_INVALID;

	for (i = 0; i < num_var_ranges; ++i) {

		unsigned short start_state, end_state, inclusive;
@@ -260,6 +257,9 @@ u8 mtrr_type_lookup(u64 start, u64 end, u8 *uniform) 
	int repeat;

	u64 partial_end;



	/* Make end inclusive instead of exclusive */

	end--;



	if (!mtrr_state_set)

		return MTRR_TYPE_INVALID;

arch/x86/mm/pgtable.c

+2 −0
Original line number Diff line number Diff line
@@ -720,6 +720,8 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr) 
	}



	free_page((unsigned long)pmd_sv);



	pgtable_pmd_page_dtor(virt_to_page(pmd));

	free_page((unsigned long)pmd);



	return 1;

drivers/atm/idt77252.c

+1 −1
Original line number Diff line number Diff line
@@ -3615,7 +3615,7 @@ static int idt77252_init_one(struct pci_dev *pcidev, 


	if ((err = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(32)))) {

		printk("idt77252: can't enable DMA for PCI device at %s\n", pci_name(pcidev));

		return err;

		goto err_out_disable_pdev;

	}



	card = kzalloc(sizeof(struct idt77252_dev), GFP_KERNEL);

drivers/base/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2362,7 +2362,7 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) 
		if (fwnode_is_primary(fn)) {

			dev->fwnode = fn->secondary;

			if (!(parent && fn == parent->fwnode))

				fn->secondary = ERR_PTR(-ENODEV);

				fn->secondary = NULL;

		} else {

			dev->fwnode = NULL;

		}