Dave Airlie 8c86394470 Linux 3.18 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUhNLZAAoJEHm+PkMAQRiGAEcH/iclYDW7k2GKemMqboy+Ohmh +ELbQothNhlGZlS1wWdD69LBiiXkkQ+ufVYFh/hC0oy0gUdfPMt5t+bOHy6cjn6w 9zOcACtpDKnqbOwRqXZjZgNmIabk7lRjbn7GK4GQqpIaW4oO0FWcT91FFhtGSPDa tjtmGRqDmbNsqfzr18h0WPEpUZmT6MxIdv17AYDliPB1MaaRuAv1Kss05TJrXdfL Oucv+C0uwnybD9UWAz6pLJ3H/HR9VJFdkaJ4Y0pbCHAuxdd1+swoTpicluHlsJA1 EkK5iWQRMpcmGwKvB0unCAQljNpaJiq4/Tlmmv8JlYpMlmIiVLT0D8BZx5q05QQ= =oGNw -----END PGP SIGNATURE----- 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		2014-12-08 10:33:52 +10:00
..
backing-dev.c	Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block	2014-10-18 11:53:51 -07:00
balloon_compaction.c	mm/balloon_compaction: fix deflation when compaction is disabled	2014-10-29 16:33:15 -07:00
bootmem.c	mem-hotplug: reset node managed pages when hot-adding a new pgdat	2014-11-13 16:17:06 -08:00
cleancache.c
cma.c	mm: cma: Use %pa to print physical addresses	2014-10-27 13:00:55 +01:00
compaction.c	mm, compaction: prevent infinite loop in compact_zone	2014-11-13 16:17:06 -08:00
debug-pagealloc.c
debug.c	mm/debug.c: use pr_emerg()	2014-10-09 22:25:59 -04:00
dmapool.c	mm/dmapool.c: fixed a brace coding style issue	2014-10-09 22:26:00 -04:00
early_ioremap.c
fadvise.c
failslab.c
filemap.c	mm/filemap.c: remove trailing whitespace	2014-10-09 22:26:00 -04:00
filemap_xip.c
fremap.c	mmu_notifier: call mmu_notifier_invalidate_range() from VMM	2014-11-13 13:46:09 +11:00
frontswap.c	mm: frontswap: invalidate expired data on a dup-store failure	2014-12-02 17:32:07 -08:00
gup.c	mm: introduce a general RCU get_user_pages_fast()	2014-10-09 22:26:00 -04:00
highmem.c
huge_memory.c	mmu_notifier: call mmu_notifier_invalidate_range() from VMM	2014-11-13 13:46:09 +11:00
hugetlb.c	mmu_notifier: call mmu_notifier_invalidate_range() from VMM	2014-11-13 13:46:09 +11:00
hugetlb_cgroup.c
hwpoison-inject.c
init-mm.c
internal.h	mm/page_alloc: restrict max order of merging on isolated pageblock	2014-11-13 16:17:05 -08:00
interval_tree.c	mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA	2014-10-09 22:25:57 -04:00
iov_iter.c	Fix thinko in iov_iter_single_seg_count	2014-11-13 13:28:55 -05:00
Kconfig	mm/balloon_compaction: add vmstat counters and kpageflags bit	2014-10-09 22:26:01 -04:00
Kconfig.debug
kmemcheck.c	mm/slab_common: move kmem_cache definition to internal header	2014-10-09 22:25:50 -04:00
kmemleak-test.c
kmemleak.c
ksm.c	mmu_notifier: call mmu_notifier_invalidate_range() from VMM	2014-11-13 13:46:09 +11:00
list_lru.c
maccess.c
madvise.c
Makefile	Fixup for 3.18: use PATCHv2 of "mm: Support compiling out madvise and fadvise"	2014-10-12 09:21:57 -04:00
memblock.c
memcontrol.c	mm: memcontrol: fix missed end-writeback page accounting	2014-10-29 16:33:15 -07:00
memory-failure.c
memory.c	Linux 3.18	2014-12-08 10:33:52 +10:00
memory_hotplug.c	mem-hotplug: reset node present pages when hot-adding a new pgdat	2014-11-13 16:17:06 -08:00
mempolicy.c	mm: mempolicy: skip inaccessible VMAs when setting MPOL_MF_LAZY	2014-10-09 22:26:02 -04:00
mempool.c
migrate.c	mmu_notifier: call mmu_notifier_invalidate_range() from VMM	2014-11-13 13:46:09 +11:00
mincore.c
mlock.c	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:44:12 +02:00
mm_init.c
mmap.c	mm: fix anon_vma_clone() error treatment	2014-12-03 09:36:04 -08:00
mmu_context.c
mmu_notifier.c	mmu_notifier: add the callback for mmu_notifier_invalidate_range()	2014-11-13 13:46:09 +11:00
mmzone.c
mprotect.c	mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared	2014-10-14 02:18:28 +02:00
mremap.c	mm/mremap.c: use linux headers	2014-10-09 22:26:00 -04:00
msync.c
nobootmem.c	mem-hotplug: reset node managed pages when hot-adding a new pgdat	2014-11-13 16:17:06 -08:00
nommu.c
oom_kill.c	OOM, PM: OOM killed task shouldn't escape PM suspend	2014-10-21 23:44:21 +02:00
page-writeback.c	mm: memcontrol: fix missed end-writeback page accounting	2014-10-29 16:33:15 -07:00
page_alloc.c	mm/debug-pagealloc: correct freepage accounting and order resetting	2014-11-13 16:17:06 -08:00
page_cgroup.c	cgroup/kmemleak: add kmemleak_free() for cgroup deallocations.	2014-10-29 16:33:13 -07:00
page_io.c
page_isolation.c	mm/page_alloc: restrict max order of merging on isolated pageblock	2014-11-13 16:17:05 -08:00
pagewalk.c	mm: use VM_BUG_ON_MM where possible	2014-10-09 22:25:58 -04:00
percpu-km.c
percpu-vm.c
percpu.c
pgtable-generic.c
process_vm_access.c
quicklist.c
readahead.c
rmap.c	Linux 3.18	2014-12-08 10:33:52 +10:00
shmem.c	shmem: support RENAME_WHITEOUT	2014-10-24 00:14:37 +02:00
slab.c	slab: fix nodeid bounds check for non-contiguous node IDs	2014-12-03 09:36:04 -08:00
slab.h	mm/slab: use percpu allocator for cpu cache	2014-10-09 22:25:51 -04:00
slab_common.c	mm/slab: fix unalignment problem on Malta with EVA due to slab merge	2014-11-13 16:17:05 -08:00
slob.c	mm/sl[ao]b: always track caller in kmalloc_(node_)track_caller()	2014-10-09 22:25:50 -04:00
slub.c	mm/slab_common: commonize slab merge logic	2014-10-09 22:25:51 -04:00
sparse-vmemmap.c
sparse.c
swap.c	mm: memcontrol: do not kill uncharge batching in free_pages_and_swap_cache	2014-10-09 22:25:59 -04:00
swap_state.c	mm: memcontrol: do not kill uncharge batching in free_pages_and_swap_cache	2014-10-09 22:25:59 -04:00
swapfile.c
truncate.c	mm: Fix comment before truncate_setsize()	2014-11-07 08:29:25 +11:00
util.c
vmacache.c
vmalloc.c	mm/vmalloc.c: use seq_open_private() instead of seq_open()	2014-10-09 22:25:56 -04:00
vmpressure.c	mm/vmpressure.c: fix race in vmpressure_work_fn()	2014-12-02 17:32:07 -08:00
vmscan.c	mm: memcontrol: fix transparent huge page allocations under pressure	2014-10-09 22:25:59 -04:00
vmstat.c	vmstat: on-demand vmstat workers V8	2014-10-09 22:26:02 -04:00
workingset.c
zbud.c	zbud: avoid accessing last unused freelist	2014-10-09 22:26:03 -04:00
zpool.c
zsmalloc.c	zsmalloc: simplify init_zspage free obj linking	2014-10-09 22:26:03 -04:00
zswap.c