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

kbuild: move asm-offsets.h to include/generated

2009-12-12 13:08:14 +01:00

asm-uaccess.h

uaccess: move VERIFY_{READ,WRITE} definitions to linux/uaccess.h

2017-03-05 20:40:25 -05:00

asmmacro.h

xtensa: fixes for configs without loop option

2015-11-02 18:02:47 +03:00

atomic.h

locking/atomic: Remove linux/atomic.h:atomic_fetch_or()

2016-06-16 10:48:32 +02:00

barrier.h

xtensa: define __smp_xxx

2016-01-12 20:46:58 +02:00

bitops.h

xtensa: fix __ffs result type

2016-07-24 06:33:29 +03:00

bootparam.h

xtensa: split bootparam and kernel meminfo

2014-04-02 01:35:51 +04:00

bugs.h

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

cache.h

dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN

2010-08-11 08:59:21 -07:00

cacheasm.h

xtensa: define ___unlock_[di]cache_all unconditionally

2016-06-29 04:18:45 +03:00

cacheflush.h

xtensa: support DMA to high memory

2015-11-09 01:25:37 +03:00

checksum.h

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

cmpxchg.h

xtensa: implement fake NMI

2015-08-17 07:33:39 +03:00

coprocessor.h

xtensa: reorganize SR referencing

2012-10-15 21:48:08 -07:00

current.h

xtensa: clean up files to make them code-style compliant

2012-12-18 21:10:25 -08:00

delay.h

xtensa: implement ndelay

2014-01-15 00:28:11 +04:00

dma-mapping.h

xtensa: remove DMA_ERROR_CODE

2017-06-20 11:13:07 +02:00

dma.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

elf.h

xtensa: add support for TLS

2013-02-23 19:35:57 -08:00

fixmap.h

xtensa: add alternative kernel memory layouts

2016-07-24 06:33:58 +03:00

flat.h

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

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

ftrace.h

ftrace: Make CALLER_ADDRx macros more generic

2014-05-21 03:10:32 -04:00

futex.h

futex: Remove duplicated code and fix undefined behaviour

2017-08-25 22:49:59 +02:00

highmem.h

xtensa: add alternative kernel memory layouts

2016-07-24 06:33:58 +03:00

hw_breakpoint.h

xtensa: support hardware breakpoints/watchpoints

2016-03-11 08:53:32 +00:00

hw_irq.h

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

initialize_mmu.h

xtensa: cleanup MMU setup and kernel layout macros

2016-07-24 06:33:58 +03:00

io.h

xtensa: support ioremap for memory outside KIO region

2016-01-11 17:37:36 +03:00

irq.h

xtensa: don't use linux IRQ #0

2017-06-05 16:53:10 -07:00

irqflags.h

xtensa: support hardware breakpoints/watchpoints

2016-03-11 08:53:32 +00:00

Kbuild

xtensa: remove wrapper header for asm/param.h

2017-07-21 03:13:29 -07:00

kmem_layout.h

xtensa: cleanup MMU setup and kernel layout macros

2016-07-24 06:33:58 +03: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

xtensa: add SMP support

2014-01-14 10:19:58 -08:00

module.h

Make most arch asm/module.h files use asm-generic/module.h

2012-09-28 14:31:03 +09:30

mxregs.h

xtensa: add MX irqchip

2014-01-14 10:19:58 -08:00

nommu_context.h

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

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

page.h

xtensa: make __pa work with uncached KSEG addresses

2017-03-30 13:29:20 -07:00

pci-bridge.h

xtensa: clean up files to make them code-style compliant

2012-12-18 21:10:25 -08:00

pci.h

PCI: Add arch_can_pci_mmap_io() on architectures which can mmap() I/O space

2017-04-18 13:02:26 -05:00

perf_event.h

xtensa: enable HAVE_PERF_EVENTS

2014-01-15 00:27:03 +04: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

arch, mm: convert all architectures to use 5level-fixup.h

2017-03-09 11:48:47 -08:00

platform.h

xtensa: extract common CPU reset code into separate function

2016-09-11 23:53:22 -07:00

processor.h

arch: remove unused *_segments() macros/functions

2017-09-22 12:59:52 -10:00

ptrace.h

xtensa: move internal ptrace definitions from uapi/asm to asm

2017-05-01 07:00:10 -07:00

regs.h

xtensa: support hardware breakpoints/watchpoints

2016-03-11 08:53:32 +00:00

segment.h

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

serial.h

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

shmparam.h

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

signal.h

consolidate kernel-side struct sigaction declarations

2013-02-03 15:09:22 -05:00

smp.h

xtensa: implement CPU hotplug

2014-01-14 10:19:59 -08:00

spinlock_types.h

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

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

spinlock.h

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

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

stacktrace.h

xtensa: move oprofile stack tracing to stacktrace.c

2015-08-17 07:32:49 +03:00

string.h

xtensa: fix str[n]cmp return value

2013-02-23 19:22:31 -08:00

switch_to.h

Disintegrate asm/system.h for Xtensa

2012-03-28 18:30:03 +01:00

syscall.h

xtensa: switch to generic sigaltstack

2013-02-03 18:16:27 -05:00

sysmem.h

xtensa: drop sysmem and switch to memblock

2016-07-24 06:34:00 +03:00

thread_info.h

xtensa: support hardware breakpoints/watchpoints

2016-03-11 08:53:32 +00:00

timex.h

xtensa: use XTENSA_INT_LEVEL macro in asm/timex.h

2016-01-11 17:32:40 +03:00

tlb.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

tlbflush.h

xtensa: optimize local_flush_tlb_kernel_range

2014-04-06 21:29:17 +04:00

traps.h

xtensa: support hardware breakpoints/watchpoints

2016-03-11 08:53:32 +00:00

types.h

UAPI: (Scripted) Disintegrate arch/xtensa/include/asm

2012-10-15 21:48:53 -07:00

uaccess.h

get rid of unused __strncpy_from_user() instances

2017-05-15 23:40:28 -04:00

ucontext.h

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

unaligned.h

xtensa: switch to packed struct unaligned access implementation

2008-11-11 06:14:10 -08:00

unistd.h

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

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

user.h

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

vectors.h

xtensa: allow merging vectors into .text section

2017-03-01 12:32:50 -08:00

vga.h

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00