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

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

Merge Linux 4.4.266 kernel 

Changes in 4.4.266: (22 commits)
        net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
        mISDN: fix crash in fritzpci
        mac80211: choose first enabled channel for monitor
        x86/build: Turn off -fcf-protection for realmode targets
        ia64: mca: allocate early mca with GFP_ATOMIC
        cifs: revalidate mapping when we open files for SMB1 POSIX
        cifs: Silently ignore unknown oplock break handle
        bpf, x86: Validate computation of branch displacements for x86-64
        ALSA: hda/realtek - Fix pincfg for Dell XPS 13 9370
        mtd: rawnand: tmio: Fix the probe error path
        mtd: rawnand: socrates: Fix the probe error path
        mtd: rawnand: sharpsl: Fix the probe error path
        mtd: rawnand: plat_nand: Fix the probe error path
        mtd: rawnand: pasemi: Fix the probe error path
        mtd: rawnand: orion: Fix the probe error path
        mtd: rawnand: diskonchip: Fix the probe error path
        tracing: Add a vmalloc_sync_mappings() for safe measure
        init/Kconfig: make COMPILE_TEST depend on !UML
        init/Kconfig: make COMPILE_TEST depend on !S390
        init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
        can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate
        Linux 4.4.266
parents 27f794ab 23a86a94

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 265

SUBLEVEL = 266

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/ia64/kernel/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -1858,7 +1858,7 @@ ia64_mca_cpu_init(void *cpu_data) 
			data = mca_bootmem();

			first_time = 0;

		} else

			data = (void *)__get_free_pages(GFP_KERNEL,

			data = (void *)__get_free_pages(GFP_ATOMIC,

							get_order(sz));

		if (!data)

			panic("Could not allocate MCA memory for cpu %d\n",

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -D__KERNEL__ \ 
		   -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   -mno-mmx -mno-sse

		   -mno-mmx -mno-sse $(call cc-option,-fcf-protection=none)



REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -ffreestanding)

REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -fno-stack-protector)

arch/x86/net/bpf_jit_comp.c

+10 −1
Original line number Diff line number Diff line
@@ -1038,7 +1038,16 @@ common_load: 
		}



		if (image) {

			if (unlikely(proglen + ilen > oldproglen)) {

			/*

			 * When populating the image, assert that:

			 *

			 *  i) We do not write beyond the allocated space, and

			 * ii) addrs[i] did not change from the prior run, in order

			 *     to validate assumptions made for computing branch

			 *     displacements.

			 */

			if (unlikely(proglen + ilen > oldproglen ||

				     proglen + ilen != addrs[i])) {

				pr_err("bpf_jit_compile fatal error\n");

				return -EFAULT;

			}

drivers/isdn/hardware/mISDN/mISDNipac.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ isac_release(struct isac_hw *isac) 
{

	if (isac->type & IPAC_TYPE_ISACX)

		WriteISAC(isac, ISACX_MASK, 0xff);

	else

	else if (isac->type != 0)

		WriteISAC(isac, ISAC_MASK, 0xff);

	if (isac->dch.timer.function != NULL) {

		del_timer(&isac->dch.timer);