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

Commit 3732ce72 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v4.2-rc8' into drm-next 

Linux 4.2-rc8

Backmerge required for Intel so they can fix their -next tree up properly.
parents e829d7ef c13dcf9f

.get_maintainer.ignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Christoph Hellwig <hch@lst.de>

Makefile

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

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -312,6 +312,9 @@ INSTALL_TARGETS = zinstall uinstall install 


PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)



bootpImage uImage: zImage

zImage: Image



$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

arch/arm/lib/uaccess_with_memcpy.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) 
	}



	/* the mmap semaphore is taken only if not in an atomic context */

	atomic = in_atomic();

	atomic = faulthandler_disabled();



	if (!atomic)

		down_read(&current->mm->mmap_sem);

arch/arm/mach-omap2/omap-wakeupgen.c

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ static struct irq_chip wakeupgen_chip = { 
	.irq_mask		= wakeupgen_mask,

	.irq_unmask		= wakeupgen_unmask,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_type		= irq_chip_set_type_parent,

	.flags			= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND,

#ifdef CONFIG_SMP

	.irq_set_affinity	= irq_chip_set_affinity_parent,