Linus Torvalds d12de1ef5e Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Pull powerpc mremap fix from Ben Herrenschmidt: "This is the patch that I had sent after -rc8 and which we decided to wait before merging. It's based on a different tree than my -next branch (it needs some pre-reqs that were in -rc4 or so while my -next is based on -rc1) so I left it as a separate branch for your to pull. It's identical to the request I did 2 or 3 weeks back. This fixes crashes in mremap with THP on powerpc. The fix however requires a small change in the generic code. It moves a condition into a helper we can override from the arch which is harmless, but it *also* slightly changes the order of the set_pmd and the withdraw & deposit, which should be fine according to Kirill (who wrote that code) but I agree -rc8 is a bit late... It was acked by Kirill and Andrew told me to just merge it via powerpc" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/thp: Fix crash on mremap		2014-01-27 21:03:39 -08:00
..
bitops	bitops/find: clarify and extend documentation	2013-11-13 12:09:22 +09:00
4level-fixup.h
atomic64.h
atomic-long.h
atomic.h	asm-generic: move cmpxchg*_local defs to cmpxchg.h	2013-03-13 06:11:05 +01:00
audit_change_attr.h	audit: Modify a set of system calls in audit class definitions	2014-01-17 17:01:46 -05:00
audit_dir_write.h
audit_read.h
audit_signal.h
audit_write.h	audit: Modify a set of system calls in audit class definitions	2014-01-17 17:01:46 -05:00
barrier.h	arch: Introduce smp_load_acquire(), smp_store_release()	2014-01-12 10:37:17 +01:00
bitops.h
bitsperlong.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
bug.h
bugs.h
cache.h
cacheflush.h
checksum.h	asm-generic headers: Allow yet more arch overrides in checksum.h	2013-02-11 20:00:33 +05:30
clkdev.h	asm-generic: Add default clkdev.h	2012-10-03 21:33:53 +02:00
cmpxchg-local.h	generic: Use raw local irq variant for generic cmpxchg	2013-02-19 08:43:37 +01:00
cmpxchg.h	asm-generic: move cmpxchg*_local defs to cmpxchg.h	2013-03-13 06:11:05 +01:00
cputime_jiffies.h	cputime: Move default nsecs_to_cputime() to jiffies based cputime file	2013-01-27 19:23:25 +01:00
cputime_nsecs.h	cputime_nsecs: use math64.h for nsec resolution conversion helpers	2013-04-26 18:58:12 +02:00
cputime.h	cputime: Generic on-demand virtual cputime accounting	2013-01-27 19:23:27 +01:00
current.h
delay.h
device.h
div64.h
dma-coherent.h
dma-mapping-broken.h	asm-generic/dma-mapping-broken.h: Provide dma_alloc_attrs()/dma_free_attrs()	2012-12-25 20:14:54 +01:00
dma-mapping-common.h
dma.h
emergency-restart.h
exec.h
fb.h
fixmap.h	add generic fixmap.h	2014-01-23 16:36:54 -08:00
ftrace.h
futex.h
getorder.h
gpio.h	GPIO bulk changes for the v3.13 development cycle	2013-11-12 15:50:46 +09:00
hardirq.h
hash.h	lib: hash: follow-up fixups for arch hash	2013-12-19 00:14:53 -05:00
hugetlb.h	mm: Fix generic hugetlb pte check return type.	2013-10-02 20:02:35 -04:00
hw_irq.h
ide_iops.h
int-ll64.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
io-64-nonatomic-hi-lo.h
io-64-nonatomic-lo-hi.h
io.h	kernel: Fix s390 absolute memory access for /dev/mem	2013-05-22 09:45:57 +02:00
ioctl.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
iomap.h
irq_regs.h
irq.h
irqflags.h
Kbuild.asm	UAPI: Set up uapi/asm/Kbuild.asm	2012-10-02 18:01:56 +01:00
kdebug.h
kmap_types.h
kvm_para.h	KVM: add kvm_para_available to asm-generic/kvm_para.h	2013-06-05 13:21:29 +03:00
libata-portmap.h
linkage.h
local64.h
local.h
memory_model.h	__page_to_pfn: Fix typo in comment	2013-10-14 15:28:29 +02:00
mm_hooks.h
mmu_context.h
mmu.h	asm-generic/mmu.h: Add support for FDPIC	2012-12-09 23:14:14 +01:00
module.h	Make most arch asm/module.h files use asm-generic/module.h	2012-09-28 14:31:03 +09:30
mutex-dec.h	arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not	2013-06-26 12:10:55 +02:00
mutex-null.h	arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not	2013-06-26 12:10:55 +02:00
mutex-xchg.h	arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not	2013-06-26 12:10:55 +02:00
mutex.h
page.h
param.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
parport.h	include: remove __dev* attributes.	2013-01-03 15:57:16 -08:00
pci_iomap.h
pci-bridge.h
pci-dma-compat.h
pci.h
percpu.h
pgalloc.h
pgtable-nopmd.h
pgtable-nopud.h
pgtable.h	powerpc/thp: Fix crash on mremap	2014-01-15 15:46:38 +11:00
preempt.h	sched: Remove PREEMPT_NEED_RESCHED from generic code	2013-12-11 15:52:32 +01:00
ptrace.h
resource.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
rtc.h
rwsem.h
scatterlist.h
sections.h	vmlinux.lds: add comments for global variables and clean up useless declarations	2013-07-03 16:07:34 -07:00
segment.h
serial.h
siginfo.h	constify copy_siginfo_to_user{,32}()	2013-11-09 00:16:29 -05:00
signal.h	unify default ptrace_signal_deliver	2012-11-29 00:01:23 -05:00
simd.h	crypto: create generic version of ablk_helper	2013-09-24 06:02:24 +10:00
sizes.h
spinlock.h
statfs.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
string.h
switch_to.h
syscall.h
syscalls.h	burying unused conditionals	2013-02-14 09:21:15 -05:00
termios-base.h
termios.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
timex.h
tlb.h	Fix TLB gather virtual address range invalidation corner cases	2013-08-16 08:52:46 -07:00
tlbflush.h
topology.h
trace_clock.h	tracing,x86: Add a TSC trace_clock	2012-11-13 15:48:27 -05:00
uaccess-unaligned.h
uaccess.h	asm-generic: uaccess: Spelling s/a ny/any/	2014-01-02 10:45:23 +01:00
unaligned.h
unistd.h	We get rid of the general module prefix confusion with a binary config option,	2013-05-05 10:58:06 -07:00
user.h
vga.h
vmlinux.lds.h	kernel: add support for init_array constructors	2013-10-17 15:05:17 +10:30
vtime.h	include/asm-generic/vtime.h: avoid zero-length file	2013-09-30 14:31:02 -07:00
word-at-a-time.h	word-at-a-time: provide generic big-endian zero_bytemask implementation	2013-12-12 10:39:01 -08:00
xor.h	asm-generic: xor: mark static functions as __maybe_unused	2012-10-03 21:21:06 +02:00