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

..

arcregs.h

ARCv2: boot log: identify HS48 cores (dual issue)

2017-10-03 20:36:49 -07:00

asm-offsets.h

…

atomic.h

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

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

barrier.h

ARC: [plat-eznps] Use dedicated SMP barriers

2016-05-09 09:32:33 +05:30

bitops.h

ARC: [plat-eznps] Use dedicated atomic/bitops/cmpxchg

2016-05-09 09:32:33 +05:30

bug.h

ARC: BUG() dumps stack after @msg (@msg now same as in generic BUG))

2014-10-13 14:46:18 +05:30

cache.h

ARCv2: SLC: provide a line based flush routine for debugging

2017-08-30 09:21:34 -07:00

cacheflush.h

ARC: mm: arc700: Don't assume 2 colours for aliasing VIPT dcache

2016-12-19 11:55:17 -08:00

checksum.h

ipv4: Update parameters for csum_tcpudp_magic to their original types

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

cmpxchg.h

ARC: [plat-eznps] Use dedicated atomic/bitops/cmpxchg

2016-05-09 09:32:33 +05:30

current.h

ARC: remove extraneous __KERNEL__ guards

2014-10-13 14:46:20 +05:30

delay.h

ARC: udelay: fix inline assembler by adding LP_COUNT to clobber list

2017-01-24 10:54:24 -08:00

disasm.h

…

dma-mapping.h

treewide: Consolidate get_dma_ops() implementations

2017-01-24 12:23:35 -05:00

dma.h

ARC: Add PCI support

2016-03-10 14:44:13 -06:00

dwarf.h

ARC: dw2 unwind: add infrastructure for adding cfi pseudo ops to asm

2016-09-30 14:48:22 -07:00

elf.h

ARC: fix build warning in elf.h

2016-10-19 14:38:53 -07:00

entry-arcv2.h

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

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

entry-compact.h

ARC: [plat-eznps] handle extra aux regs #2: kernel/entry exit

2017-08-28 15:17:36 -07:00

entry.h

ARC: use correct offset in pt_regs for saving/restoring user mode r25

2016-08-19 10:44:13 -07:00

exec.h

…

fb.h

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

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

futex.h

futex: Remove duplicated code and fix undefined behaviour

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

highmem.h

ARC: mm: HIGHMEM: kmap API implementation

2015-10-28 19:49:04 +05:30

hugepage.h

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

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

io.h

ARC: Add missing io barriers to io{read,write}{16,32}be()

2016-05-05 16:35:28 +05:30

irq.h

ARCv2: intc: Use runtime value of irq count for setting up intc

2017-02-06 09:37:57 -08:00

irqflags-arcv2.h

ARC: create cpu specific version of arch_cpu_idle()

2017-08-28 15:17:36 -07:00

irqflags-compact.h

ARC: create cpu specific version of arch_cpu_idle()

2017-08-28 15:17:36 -07:00

irqflags.h

ARCv2: Support for ARCv2 ISA and HS38x cores

2015-06-22 14:06:55 +05:30

Kbuild

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

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

kdebug.h

…

kgdb.h

ARC: Update order of registers in KGDB to match GDB 7.5

2014-10-13 14:46:20 +05:30

kmap_types.h

ARC: mm: HIGHMEM: kmap API implementation

2015-10-28 19:49:04 +05:30

kprobes.h

ARC: fix build warnings with !CONFIG_KPROBES

2017-03-30 17:33:20 -07:00

linkage.h

ARC: dw2 unwind: add infrastructure for adding cfi pseudo ops to asm

2016-09-30 14:48:22 -07:00

mach_desc.h

ARC: smp: Rename platform hook @init_cpu_smp -> @init_per_cpu

2015-12-17 12:56:56 +05:30

mmu_context.h

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/mm.h>

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

mmu.h

ARCv2: PAE40: set MSB even if !CONFIG_ARC_HAS_PAE40 but PAE exists in SoC

2017-08-04 13:56:35 +05:30

mmzone.h

ARC: support HIGHMEM even without PAE40

2016-05-05 16:35:46 +05:30

module.h

ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds

2017-01-18 11:17:44 -08:00

page.h

ARC: mm: Decouple RAM base address from kernel link address

2017-09-01 11:26:27 -07:00

pci.h

ARC: Add PCI support

2016-03-10 14:44:13 -06:00

perf_event.h

arc: perf: Enable generic "cache-references" and "cache-misses" events

2016-09-30 14:48:18 -07:00

pgalloc.h

arc: get rid of superfluous __GFP_REPEAT

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

pgtable.h

ARC: mm: fix build failure in linux-next for UP builds

2017-05-05 12:06:33 -07:00

processor.h

arch: remove unused *_segments() macros/functions

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

ptrace.h

ARC: [plat-eznps] handle extra aux regs #2: kernel/entry exit

2017-08-28 15:17:36 -07:00

sections.h

of/fdt: consolidate built-in dtb section variables

2014-04-30 00:59:13 -05:00

segment.h

…

serial.h

ARC: Dynamically determine BASE_BAUD from DeviceTree

2015-02-02 17:08:37 +05:30

setup.h

ARCv2: IOC: Use actual memory size to setup aperture size

2017-01-18 14:52:43 -08:00

shmparam.h

…

smp.h

ARC: IRQ: Do not use hwirq as virq and vice versa

2016-11-08 12:05:10 -08:00

spinlock_types.h

ARC: LLOCK/SCOND based rwlock

2015-08-04 09:26:33 +05:30

spinlock.h

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

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

stacktrace.h

ARC: Make arc_unwind_core accessible externally

2015-02-27 10:15:00 +05:30

string.h

ARC: remove extraneous __KERNEL__ guards

2014-10-13 14:46:20 +05:30

switch_to.h

ARC: [plat-eznps] handle extra aux regs #1: save/restore on context switch

2017-08-28 15:17:36 -07:00

syscall.h

…

syscalls.h

ARC: syscall for userspace cmpxchg assist

2016-10-24 09:24:26 -07:00

thread_info.h

Fix typos

2016-05-30 10:07:32 +05:30

timex.h

…

tlb-mmu1.h

…

tlb.h

…

tlbflush.h

ARC: thp: unbork !CONFIG_TRANSPARENT_HUGEPAGE build

2016-03-17 15:31:45 +05:30

uaccess.h

ARC: uaccess: enable INLINE_COPY_{TO,FROM}_USER ...

2017-03-30 00:07:48 -04:00

unaligned.h

ARC: rename kconfig option for unaligned emulation

2014-10-13 14:46:15 +05:30

unwind.h

ARC: dw2 unwind: Reinstante unwinding out of modules

2015-12-17 11:10:23 +05:30