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

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

Merge Linux 4.4.248 kernel 

Changes in 4.4.248: (39 commits)
        net/af_iucv: set correct sk_protocol for child sockets
        rose: Fix Null pointer dereference in rose_send_frame()
        usbnet: ipheth: fix connectivity with iOS 14
        bonding: wait for sysfs kobject destruction before freeing struct slave
        netfilter: bridge: reset skb->pkt_type after NF_INET_POST_ROUTING traversal
        net/x25: prevent a couple of overflows
        cxgb3: fix error return code in t3_sge_alloc_qset()
        net: pasemi: fix error return code in pasemi_mac_open()
        dt-bindings: net: correct interrupt flags in examples
        Input: xpad - support Ardwiino Controllers
        Input: i8042 - add ByteSpeed touchpad to noloop table
        powerpc: Stop exporting __clear_user which is now inlined.
        btrfs: sysfs: init devices outside of the chunk_mutex
        vlan: consolidate VLAN parsing code and limit max parsing depth
        usb: gadget: f_fs: Use local copy of descriptors for userspace copy
        USB: serial: kl5kusb105: fix memleak on open
        USB: serial: ch341: add new Product ID for CH341A
        USB: serial: ch341: sort device-id entries
        USB: serial: option: add Fibocom NL668 variants
        USB: serial: option: add support for Thales Cinterion EXS82
        tty: Fix ->pgrp locking in tiocspgrp()
        ALSA: hda/realtek - Add new codec supported for ALC897
        ALSA: hda/generic: Add option to enforce preferred_dacs pairs
        tty: Fix ->session locking
        cifs: fix potential use-after-free in cifs_echo_request()
        i2c: imx: Fix reset of I2SR_IAL flag
        i2c: imx: Check for I2SR_IAL after every byte
        arm64: assembler: make adr_l work in modules under KASLR
        iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
        spi: Introduce device-managed SPI controller allocation
        spi: bcm2835: Fix use-after-free on unbind
        spi: bcm2835: Release the DMA channel if probe fails after dma_init
        tracing: Fix userstacktrace option for instances
        btrfs: cleanup cow block on error
        mm/userfaultfd: do not access vma->vm_mm after calling handle_userfault()
        gfs2: check for empty rgrp tree in gfs2_ri_update
        Input: i8042 - fix error return code in i8042_setup_aux()
        x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes
        Linux 4.4.248

Conflicts:
	arch/arm64/kernel/head.S
	include/linux/spi/spi.h
parents da598495 f299fb63

Documentation/devicetree/bindings/net/nfc/nxp-nci.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2): 
		clock-frequency = <100000>;



		interrupt-parent = <&gpio1>;

		interrupts = <29 GPIO_ACTIVE_HIGH>;

		interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;



		enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

Documentation/devicetree/bindings/net/nfc/pn544.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Example (for ARM-based BeagleBone with PN544 on I2C2): 
		clock-frequency = <400000>;



		interrupt-parent = <&gpio1>;

		interrupts = <17 GPIO_ACTIVE_HIGH>;

		interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;



		enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 247

SUBLEVEL = 248

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm64/include/asm/assembler.h

+27 −9
Original line number Diff line number Diff line
@@ -189,22 +189,25 @@ lr .req x30 // link register 


/*

 * Pseudo-ops for PC-relative adr/ldr/str <reg>, <symbol> where

 * <symbol> is within the range +/- 4 GB of the PC.

 * <symbol> is within the range +/- 4 GB of the PC when running

 * in core kernel context. In module context, a movz/movk sequence

 * is used, since modules may be loaded far away from the kernel

 * when KASLR is in effect.

 */

	/*

	 * @dst: destination register (64 bit wide)

	 * @sym: name of the symbol

	 * @tmp: optional scratch register to be used if <dst> == sp, which

	 *       is not allowed in an adrp instruction

	 */

	.macro	adr_l, dst, sym, tmp=

	.ifb	\tmp

	.macro	adr_l, dst, sym

#ifndef MODULE

	adrp	\dst, \sym

	add	\dst, \dst, :lo12:\sym

	.else

	adrp	\tmp, \sym

	add	\dst, \tmp, :lo12:\sym

	.endif

#else

	movz	\dst, #:abs_g3:\sym

	movk	\dst, #:abs_g2_nc:\sym

	movk	\dst, #:abs_g1_nc:\sym

	movk	\dst, #:abs_g0_nc:\sym

#endif

	.endm



	/*
@@ -215,6 +218,7 @@ lr .req x30 // link register 
	 *       the address

	 */

	.macro	ldr_l, dst, sym, tmp=

#ifndef MODULE

	.ifb	\tmp

	adrp	\dst, \sym

	ldr	\dst, [\dst, :lo12:\sym]
@@ -222,6 +226,15 @@ lr .req x30 // link register 
	adrp	\tmp, \sym

	ldr	\dst, [\tmp, :lo12:\sym]

	.endif

#else

	.ifb	\tmp

	adr_l	\dst, \sym

	ldr	\dst, [\dst]

	.else

	adr_l	\tmp, \sym

	ldr	\dst, [\tmp]

	.endif

#endif

	.endm



	/*
@@ -231,8 +244,13 @@ lr .req x30 // link register 
	 *       while <src> needs to be preserved.

	 */

	.macro	str_l, src, sym, tmp

#ifndef MODULE

	adrp	\tmp, \sym

	str	\src, [\tmp, :lo12:\sym]

#else

	adr_l	\tmp, \sym

	str	\src, [\tmp]

#endif

	.endm



	/*

arch/powerpc/lib/ppc_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ EXPORT_SYMBOL(csum_tcpudp_magic); 
#endif



EXPORT_SYMBOL(__copy_tofrom_user);

EXPORT_SYMBOL(__clear_user);

EXPORT_SYMBOL(copy_page);



#ifdef CONFIG_PPC64