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

Unverified Commit 009678fa authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.242 kernel

Changes in 4.4.242: (87 commits)
        SUNRPC: ECONNREFUSED should cause a rebind.
        scripts/setlocalversion: make git describe output more reliable
        powerpc/powernv/opal-dump : Use IRQ_HANDLED instead of numbers in interrupt handler
        efivarfs: Replace invalid slashes with exclamation marks in dentries.
        ravb: Fix bit fields checking in ravb_hwtstamp_get()
        tipc: fix memory leak caused by tipc_buf_append()
        mtd: lpddr: Fix bad logic in print_drs_error
        ata: sata_rcar: Fix DMA boundary mask
        fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
        f2fs crypto: avoid unneeded memory allocation in ->readdir
        powerpc/powernv/smp: Fix spurious DBG() warning
        sparc64: remove mm_cpumask clearing to fix kthread_use_mm race
        f2fs: fix to check segment boundary during SIT page readahead
        um: change sigio_spinlock to a mutex
        xfs: fix realtime bitmap/summary file truncation when growing rt volume
        video: fbdev: pvr2fb: initialize variables
        ath10k: fix VHT NSS calculation when STBC is enabled
        mmc: via-sdmmc: Fix data race bug
        printk: reduce LOG_BUF_SHIFT range for H8300
        kgdb: Make "kgdbcon" work properly with "kgdb_earlycon"
        USB: adutux: fix debugging
        drivers/net/wan/hdlc_fr: Correctly handle special skb->protocol values
        power: supply: test_power: add missing newlines when printing parameters by sysfs
        md/bitmap: md_bitmap_get_counter returns wrong blocks
        clk: ti: clockdomain: fix static checker warning
        net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid
        drivers: watchdog: rdc321x_wdt: Fix race condition bugs
        ext4: Detect already used quota file early
        gfs2: add validation checks for size of superblock
        memory: emif: Remove bogus debugfs error handling
        ARM: dts: s5pv210: move PMU node out of clock controller
        ARM: dts: s5pv210: remove dedicated 'audio-subsystem' node
        md/raid5: fix oops during stripe resizing
        leds: bcm6328, bcm6358: use devres LED registering function
        NFS: fix nfs_path in case of a rename retry
        ACPI / extlog: Check for RDMSR failure
        ACPI: video: use ACPI backlight for HP 635 Notebook
        acpi-cpufreq: Honor _PSD table setting on new AMD CPUs
        w1: mxc_w1: Fix timeout resolution problem leading to bus error
        scsi: mptfusion: Fix null pointer dereferences in mptscsih_remove()
        btrfs: reschedule if necessary when logging directory items
        vt: keyboard, simplify vt_kdgkbsent
        vt: keyboard, extend func_buf_lock to readers
        dmaengine: dma-jz4780: Fix race in jz4780_dma_tx_status
        iio:gyro:itg3200: Fix timestamp alignment and prevent data leak.
        powerpc/powernv/elog: Fix race while processing OPAL error log event.
        ubifs: dent: Fix some potential memory leaks while iterating entries
        ubi: check kthread_should_stop() after the setting of task state
        ia64: fix build error with !COREDUMP
        ceph: promote to unsigned long long before shifting
        libceph: clear con->out_msg on Policy::stateful_server faults
        9P: Cast to loff_t before multiplying
        ring-buffer: Return 0 on success from ring_buffer_resize()
        vringh: fix __vringh_iov() when riov and wiov are different
        tty: make FONTX ioctl use the tty pointer they were actually passed
        arm64: berlin: Select DW_APB_TIMER_OF
        cachefiles: Handle readpage error correctly
        hil/parisc: Disable HIL driver when it gets stuck
        ARM: samsung: fix PM debug build with DEBUG_LL but !MMU
        ARM: s3c24xx: fix missing system reset
        device property: Keep secondary firmware node secondary by type
        device property: Don't clear secondary pointer for shared primary firmware node
        staging: comedi: cb_pcidas: Allow 2-channel commands for AO subdevice
        xen/events: don't use chip_data for legacy IRQs
        tipc: fix use-after-free in tipc_bcast_get_mode
        gianfar: Replace skb_realloc_headroom with skb_cow_head for PTP
        gianfar: Account for Tx PTP timestamp in the skb headroom
        Fonts: Replace discarded const qualifier
        ALSA: usb-audio: Add implicit feedback quirk for Qu-16
        ftrace: Fix recursion check for NMI test
        ftrace: Handle tracing when switching between context
        ARM: dts: sun4i-a10: fix cpu_alert temperature
        x86/kexec: Use up-to-dated screen_info copy to fill boot params
        of: Fix reserved-memory overlap detection
        scsi: core: Don't start concurrent async scan on same host
        vsock: use ns_capable_noaudit() on socket create
        vt: Disable KD_FONT_OP_COPY
        fork: fix copy_process(CLONE_PARENT) race with the exiting ->real_parent
        serial: 8250_mtk: Fix uart_get_baud_rate warning
        serial: txx9: add missing platform_driver_unregister() on error in serial_txx9_init
        USB: serial: cyberjack: fix write-URB completion race
        USB: serial: option: add LE910Cx compositions 0x1203, 0x1230, 0x1231
        USB: serial: option: add Telit FN980 composition 0x1055
        USB: Add NO_LPM quirk for Kingston flash drive
        ARC: stack unwinding: avoid indefinite looping
        Revert "ARC: entry: fix potential EFA clobber when TIF_SYSCALL_TRACE"
        Linux 4.4.242

Conflicts:
	fs/f2fs/dir.c
	fs/f2fs/namei.c
	scripts/setlocalversion
parents c585916a ad5e80d0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 241
SUBLEVEL = 242
EXTRAVERSION =
NAME = Blurry Fish Butt

+11 −5
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ END(EV_Extension)
tracesys:
	; save EFA in case tracer wants the PC of traced task
	; using ERET won't work since next-PC has already committed
	lr  r12, [efa]
	GET_CURR_TASK_FIELD_PTR   TASK_THREAD, r11
	st  r12, [r11, THREAD_FAULT_ADDR]	; thread.fault_address

@@ -210,9 +211,15 @@ tracesys_exit:
; Breakpoint TRAP
; ---------------------------------------------
trap_with_param:
	mov r0, r12	; EFA in case ptracer/gdb wants stop_pc

	; stop_pc info by gdb needs this info
	lr  r0, [efa]
	mov r1, sp

	; Now that we have read EFA, it is safe to do "fake" rtie
	;   and get out of CPU exception mode
	FAKE_RET_FROM_EXCPN

	; Save callee regs in case gdb wants to have a look
	; SP will grow up by size of CALLEE Reg-File
	; NOTE: clobbers r12
@@ -239,10 +246,6 @@ ENTRY(EV_Trap)

	EXCEPTION_PROLOGUE

	lr  r12, [efa]

	FAKE_RET_FROM_EXCPN

	;============ TRAP 1   :breakpoints
	; Check ECR for trap with arg (PROLOGUE ensures r9 has ECR)
	bmsk.f 0, r9, 7
@@ -250,6 +253,9 @@ ENTRY(EV_Trap)

	;============ TRAP  (no param): syscall top level

	; First return from Exception to pure K mode (Exception/IRQs renabled)
	FAKE_RET_FROM_EXCPN

	; If syscall tracing ongoing, invoke pre-post-hooks
	GET_CURR_THR_INFO_FLAGS   r10
	btst r10, TIF_SYSCALL_TRACE
+6 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
		int (*consumer_fn) (unsigned int, void *), void *arg)
{
#ifdef CONFIG_ARC_DW2_UNWIND
	int ret = 0;
	int ret = 0, cnt = 0;
	unsigned int address;
	struct unwind_frame_info frame_info;

@@ -133,6 +133,11 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
			break;

		frame_info.regs.r63 = frame_info.regs.r31;

		if (cnt++ > 128) {
			printk("unwinder looping too long, aborting !\n");
			return 0;
		}
	}

	return address;		/* return the last address it saw */
+2 −0
Original line number Diff line number Diff line
@@ -721,7 +721,9 @@ config ARCH_S3C24XX
	select HAVE_S3C_RTC if RTC_CLASS
	select MULTI_IRQ_HANDLER
	select NEED_MACH_IO_H
	select S3C2410_WATCHDOG
	select SAMSUNG_ATAGS
	select WATCHDOG
	help
	  Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
	  and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
+34 −44
Original line number Diff line number Diff line
@@ -99,20 +99,17 @@
		};

		clocks: clock-controller@e0100000 {
			compatible = "samsung,s5pv210-clock", "simple-bus";
			compatible = "samsung,s5pv210-clock";
			reg = <0xe0100000 0x10000>;
			clock-names = "xxti", "xusbxti";
			clocks = <&xxti>, <&xusbxti>;
			#clock-cells = <1>;
			#address-cells = <1>;
			#size-cells = <1>;
			ranges;
		};

		pmu_syscon: syscon@e0108000 {
			compatible = "samsung-s5pv210-pmu", "syscon";
			reg = <0xe0108000 0x8000>;
		};
		};

		pinctrl0: pinctrl@e0200000 {
			compatible = "samsung,s5pv210-pinctrl";
@@ -228,12 +225,6 @@
			status = "disabled";
		};

		audio-subsystem {
			compatible = "samsung,s5pv210-audss", "simple-bus";
			#address-cells = <1>;
			#size-cells = <1>;
			ranges;

		clk_audss: clock-controller@eee10000 {
			compatible = "samsung,s5pv210-audss-clock";
			reg = <0xeee10000 0x1000>;
@@ -265,7 +256,6 @@
			#sound-dai-cells = <0>;
			status = "disabled";
		};
		};

		i2s1: i2s@e2100000 {
			compatible = "samsung,s3c6410-i2s";
Loading