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

Commit 8c863944 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v3.18' into drm-next 

Linux 3.18

Backmerge Linus tree into -next as we had conflicts in i915/radeon/nouveau,
and everyone was solving them individually.

* tag 'v3.18': (57 commits)
  Linux 3.18
  watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7
  uapi: fix to export linux/vm_sockets.h
  i2c: cadence: Set the hardware time-out register to maximum value
  i2c: davinci: generate STP always when NACK is received
  ahci: disable MSI on SAMSUNG 0xa800 SSD
  context_tracking: Restore previous state in schedule_user
  slab: fix nodeid bounds check for non-contiguous node IDs
  lib/genalloc.c: export devm_gen_pool_create() for modules
  mm: fix anon_vma_clone() error treatment
  mm: fix swapoff hang after page migration and fork
  fat: fix oops on corrupted vfat fs
  ipc/sem.c: fully initialize sem_array before making it visible
  drivers/input/evdev.c: don't kfree() a vmalloc address
  cxgb4: Fill in supported link mode for SFP modules
  xen-netfront: Remove BUGs on paged skb data which crosses a page boundary
  mm/vmpressure.c: fix race in vmpressure_work_fn()
  mm: frontswap: invalidate expired data on a dup-store failure
  mm: do not overwrite reserved pages counter at show_mem()
  drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6
  ...

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/nouveau/nouveau_drm.c
	drivers/gpu/drm/radeon/radeon_cs.c
parents 7608867d b2776bf7

MAINTAINERS

+20 −18
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ F: include/net/ax25.h 
F:	net/ax25/



AZ6007 DVB DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -2208,7 +2208,7 @@ F: Documentation/filesystems/btrfs.txt 
F:	fs/btrfs/



BTTV VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -2729,7 +2729,7 @@ F: drivers/media/common/cx2341x* 
F:	include/media/cx2341x*



CX88 VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -3419,7 +3419,7 @@ F: fs/ecryptfs/ 
EDAC-CORE

M:	Doug Thompson <dougthompson@xmission.com>

M:	Borislav Petkov <bp@alien8.de>

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Supported
@@ -3468,7 +3468,7 @@ S: Maintained 
F:	drivers/edac/e7xxx_edac.c



EDAC-GHES

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained
@@ -3496,21 +3496,21 @@ S: Maintained 
F:	drivers/edac/i5000_edac.c



EDAC-I5400

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained

F:	drivers/edac/i5400_edac.c



EDAC-I7300

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained

F:	drivers/edac/i7300_edac.c



EDAC-I7CORE

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained
@@ -3553,7 +3553,7 @@ S: Maintained 
F:	drivers/edac/r82600_edac.c



EDAC-SBRIDGE

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained
@@ -3613,7 +3613,7 @@ S: Maintained 
F:	drivers/net/ethernet/ibm/ehea/



EM28XX VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -5979,7 +5979,7 @@ S: Maintained 
F:	drivers/media/radio/radio-maxiradio*



MEDIA INPUT INFRASTRUCTURE (V4L/DVB)

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

P:	LinuxTV.org Project

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org
@@ -8030,7 +8030,7 @@ S: Odd Fixes 
F:	drivers/media/i2c/saa6588*



SAA7134 VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -8488,7 +8488,7 @@ S: Maintained 
F:	drivers/media/radio/si4713/radio-usb-si4713.c



SIANO DVB DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -8699,7 +8699,9 @@ S: Maintained 
F:	drivers/leds/leds-net48xx.c



SOFTLOGIC 6x10 MPEG CODEC

M:	Ismael Luceno <ismael.luceno@corp.bluecherry.net>

M:	Bluecherry Maintainers <maintainers@bluecherrydvr.com>

M:	Andrey Utkin <andrey.utkin@corp.bluecherry.net>

M:	Andrey Utkin <andrey.krieger.utkin@gmail.com>

L:	linux-media@vger.kernel.org

S:	Supported

F:	drivers/media/pci/solo6x10/
@@ -9173,7 +9175,7 @@ S: Maintained 
F:	drivers/media/i2c/tda9840*



TEA5761 TUNER DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -9181,7 +9183,7 @@ S: Odd fixes 
F:	drivers/media/tuners/tea5761.*



TEA5767 TUNER DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -9493,7 +9495,7 @@ F: include/linux/shmem_fs.h 
F:	mm/shmem.c



TM6000 VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git
@@ -10314,7 +10316,7 @@ S: Maintained 
F:	arch/x86/kernel/cpu/mcheck/*



XC2028/3028 TUNER DRIVER

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

L:	linux-media@vger.kernel.org

W:	http://linuxtv.org

T:	git git://linuxtv.org/media_tree.git

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Diseased Newt



# *DOCUMENTATION*

arch/s390/kernel/nmi.c

+2 −6
Original line number Diff line number Diff line
@@ -54,12 +54,8 @@ void s390_handle_mcck(void) 
	 */

	local_irq_save(flags);

	local_mcck_disable();

	/*

	 * Ummm... Does this make sense at all? Copying the percpu struct

	 * and then zapping it one statement later?

	 */

	memcpy(&mcck, this_cpu_ptr(&cpu_mcck), sizeof(mcck));

	memset(&mcck, 0, sizeof(struct mcck_struct));

	mcck = *this_cpu_ptr(&cpu_mcck);

	memset(this_cpu_ptr(&cpu_mcck), 0, sizeof(mcck));

	clear_cpu_flag(CIF_MCCK_PENDING);

	local_mcck_enable();

	local_irq_restore(flags);

arch/x86/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ suffix-$(CONFIG_KERNEL_XZ) := xz 
suffix-$(CONFIG_KERNEL_LZO) 	:= lzo

suffix-$(CONFIG_KERNEL_LZ4) 	:= lz4



RUN_SIZE = $(shell objdump -h vmlinux | \

RUN_SIZE = $(shell $(OBJDUMP) -h vmlinux | \

	     perl $(srctree)/arch/x86/tools/calc_run_size.pl)

quiet_cmd_mkpiggy = MKPIGGY $@

      cmd_mkpiggy = $(obj)/mkpiggy $< $(RUN_SIZE) > $@ || ( rm -f $@ ; false )

arch/x86/kernel/cpu/microcode/core.c

+2 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ static void mc_bp_resume(void) 


	if (uci->valid && uci->mc)

		microcode_ops->apply_microcode(cpu);

#ifdef CONFIG_X86_64

	else if (!uci->mc)

		/*

		 * We might resume and not have applied late microcode but still
@@ -473,6 +474,7 @@ static void mc_bp_resume(void) 
		 * applying patches early on the APs.

		 */

		load_ucode_ap();

#endif

}



static struct syscore_ops mc_syscore_ops = {