Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ...

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:32:44 +01:00

..

asm-offsets.h

Hexagon: Add processor and system headers

2011-11-01 07:34:18 -07:00

atomic.h

locking/atomic: Fix atomic_set_release() for 'funny' architectures

2017-08-10 12:28:54 +02:00

bitops.h

arch,hexagon: Convert smp_mb__*()

2014-04-18 14:20:35 +02:00

cache.h

Hexagon: set ARCH_DMA_MINALIGN

2014-12-16 13:27:30 -06:00

cacheflush.h

hexagon: Fix build failures in linux-next

2014-12-16 13:27:12 -06:00

checksum.h

ipv4: Update parameters for csum_tcpudp_magic to their original types

2016-03-13 23:55:13 -04:00

cmpxchg.h

arch: Remove __ARCH_HAVE_CMPXCHG

2015-05-13 10:55:42 +02:00

delay.h

arch: hexagon: kernel: add export symbol function __delay()

2014-04-04 18:19:59 -05:00

dma-mapping.h

hexagon: remove the unused dma_is_consistent prototype

2017-06-28 06:54:43 -07:00

dma.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

elf.h

Hexagon: update CR year for elf.h

2014-04-04 18:20:02 -05:00

exec.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

fixmap.h

hexagon: use generic fixmap.h

2014-01-23 16:36:54 -08:00

fpu.h

Hexagon: Core arch-specific header files

2011-11-01 07:34:18 -07:00

futex.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

hexagon_vm.h

hexagon: Fix misspellings in comments.

2016-04-18 12:45:54 +02:00

intrinsics.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

io.h

hexagon: Fix build failures in linux-next

2014-12-16 13:27:12 -06:00

irq.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

irqflags.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

Kbuild

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

kgdb.h

hexagon: include: asm: kgdb: extend DBG_MAX_REG_NUM for "cs0/1"

2014-04-04 18:19:59 -05:00

linkage.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

mem-layout.h

Hexagon: use correct translation for VMALLOC_START

2013-04-30 19:40:29 -05:00

mmu_context.h

sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>

2017-03-02 08:42:37 +01:00

mmu.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

module.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

page.h

Hexagon: use correct translations for DMA mappings

2013-04-30 19:40:28 -05:00

perf_event.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

pgalloc.h

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

pgtable.h

mm: memcontrol: per-lruvec stats infrastructure

2017-07-06 16:24:35 -07:00

processor.h

arch: remove unused macro/function thread_saved_pc()

2017-06-28 16:13:57 -07:00

smp.h

smp, hexagon: kill SMP single function call interrupt

2014-04-04 18:20:01 -05:00

spinlock_types.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

spinlock.h

locking/arch: Remove dummy arch_{read,spin,write}_lock_flags() implementations

2017-10-10 11:50:19 +02:00

string.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

suspend.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

switch_to.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

syscall.h

take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h

2012-11-28 23:43:27 -05:00

thread_info.h

arch: Remove exec_domain from remaining archs

2015-04-12 21:03:30 +02:00

time.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

timer-regs.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

timex.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

tlb.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

tlbflush.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

traps.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

uaccess.h

hexagon: switch to RAW_COPY_USER

2017-04-24 20:28:29 -04:00

vdso.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

vm_fault.h

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

vm_mmu.h

hexagon: Fix misspellings in comments.

2016-04-18 12:45:54 +02:00