Linus Torvalds 857b50f5d0 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Pull MIPS updates from Ralf Baechle: "This is the MIPS pull request for the next kernel: - Zubair's patch series adds CMA support for MIPS. Doing so it also touches ARM64 and x86. - remove the last instance of IRQF_DISABLED from arch/mips - updates to two of the MIPS defconfig files. - cleanup of how cache coherency bits are handled on MIPS and implement support for write-combining. - platform upgrades for Alchemy - move MIPS DTS files to arch/mips/boot/dts/" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (24 commits) MIPS: ralink: remove deprecated IRQF_DISABLED MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS MIPS: cpu-probe: Set the write-combine CCA value on per core basis MIPS: pgtable-bits: Define the CCA bit for WC writes on Ingenic cores MIPS: pgtable-bits: Move the CCA bits out of the core's ifdef blocks MIPS: DMA: Add cma support x86: use generic dma-contiguous.h arm64: use generic dma-contiguous.h asm-generic: Add dma-contiguous.h MIPS: BPF: Add new emit_long_instr macro MIPS: ralink: Move device-trees to arch/mips/boot/dts/ MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/ MIPS: sead3: Move device-trees to arch/mips/boot/dts/ MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/ MIPS: Octeon: Move device-trees to arch/mips/boot/dts/ MIPS: Add support for building device-tree binaries MIPS: Create common infrastructure for building built-in device-trees MIPS: SEAD3: Enable DEVTMPFS MIPS: SEAD3: Regenerate defconfigs MIPS: Alchemy: DB1300: Add touch penirq support ...		2014-10-18 14:24:36 -07:00
..
bitops	arch: Mass conversion of smp_mb__*()	2014-04-18 14:20:48 +02:00
4level-fixup.h
atomic64.h	locking,arch: Rewrite generic atomic support	2014-08-14 12:48:14 +02:00
atomic-long.h
atomic.h	locking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read()	2014-10-03 06:06:23 +02: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: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
audit_read.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
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: Prepare for smp_mb__{before,after}_atomic()	2014-04-18 11:40:30 +02:00
bitops.h	arch: Prepare for smp_mb__{before,after}_atomic()	2014-04-18 11:40:30 +02:00
bitsperlong.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
bug.h	bug: Make BUG() always stop the machine	2014-04-07 16:36:10 -07:00
bugs.h
cache.h
cacheflush.h	asm-generic/cacheflush.h: flush icache when copying to user pages	2011-05-25 08:39:37 -07:00
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: COMMON_CLK defines __clk_{get,put}	2014-09-25 18:00:45 -07:00
cmpxchg-local.h	LLVMLinux: Remove warning about returning an uninitialized variable	2014-04-09 13:44:35 -07:00
cmpxchg.h	asm-generic: move cmpxchg*_local defs to cmpxchg.h	2013-03-13 06:11:05 +01:00
cputime_jiffies.h	sched, time: Fix build error with 64 bit cputime_t on 32 bit systems	2014-10-03 05:46:55 +02:00
cputime_nsecs.h	sched, time: Fix build error with 64 bit cputime_t on 32 bit systems	2014-10-03 05:46:55 +02:00
cputime.h	cputime: Generic on-demand virtual cputime accounting	2013-01-27 19:23:27 +01:00
current.h
delay.h	asm-generic: delay.h fix udelay and ndelay for 8 bit args	2011-07-22 18:45:33 +02:00
device.h
div64.h
dma-coherent.h	DMA-API: Change dma_declare_coherent_memory() CPU address to phys_addr_t	2014-05-20 16:55:23 -06:00
dma-contiguous.h	asm-generic: Add dma-contiguous.h	2014-09-22 13:35:51 +02:00
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	Merge branch 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2014-10-10 16:56:08 -04:00
dma.h
early_ioremap.h	mm: create generic early_ioremap() support	2014-04-07 16:36:15 -07:00
emergency-restart.h
exec.h	Split arch_align_stack() out from asm-generic/system.h	2012-03-28 18:30:03 +01:00
fb.h
fixmap.h	arm64: fixmap: fix missing sub-page offset for earlyprintk	2014-05-03 22:20:31 +01:00
ftrace.h	asm-generic headers: add ftrace.h	2011-03-17 09:19:04 +08:00
futex.h
getorder.h	bitops: Add missing parentheses to new get_order macro	2012-02-24 10:39:27 -08:00
gpio.h	gpio: Increase ARCH_NR_GPIOs to 512	2014-09-23 17:51:39 +02: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	readq/writeq: Add explicit lo_hi_[read|write]_q and hi_lo_[read|write]_q	2014-07-04 13:27:30 +02:00
io-64-nonatomic-lo-hi.h	readq/writeq: Add explicit lo_hi_[read|write]_q and hi_lo_[read|write]_q	2014-07-04 13:27:30 +02:00
io.h	asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP	2014-09-30 09:42:44 -06:00
ioctl.h	include/asm-generic/ioctl.h: fix _IOC_TYPECHECK sparse error	2014-06-06 16:08:13 -07:00
iomap.h	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
irq_regs.h
irq_work.h	irq_work: Introduce arch_irq_work_has_interrupt()	2014-09-13 18:38:07 +02:00
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	asm-generic: remove km_type definitions	2012-07-24 15:27:30 +08:00
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	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
local.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
mcs_spinlock.h	locking/mcs: Allow architecture specific asm files to be used for contended case	2014-02-09 21:18:52 +01:00
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	The following changes since commit 3ee72ca992	2012-01-10 17:39:40 -08:00
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	[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional	2012-02-27 09:43:30 -06:00
pci-bridge.h	PCI: work around Stratus ftServer broken PCIe hierarchy	2012-04-30 15:21:02 -06:00
pci-dma-compat.h	pci-dma-compat: add pci_zalloc_consistent helper	2014-08-08 15:57:28 -07:00
pci.h	PCI: collapse pcibios_resource_to_bus	2012-02-23 20:19:04 -07:00
percpu.h	percpu: preffity percpu header files	2014-06-17 19:12:40 -04:00
pgalloc.h
pgtable-nopmd.h
pgtable-nopud.h
pgtable.h	mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared	2014-10-14 02:18:28 +02:00
preempt.h	sched: Remove PREEMPT_NEED_RESCHED from generic code	2013-12-11 15:52:32 +01:00
ptrace.h	asm-generic/ptrace.h: start a common low level ptrace helper	2011-05-26 17:12:36 -07:00
qrwlock_types.h	locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks	2014-06-06 07:58:28 +02:00
qrwlock.h	locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks	2014-06-06 07:58:28 +02:00
resource.h	asm-generic: remove _STK_LIM_MAX	2014-05-15 00:32:09 +01:00
rtc.h
rwsem.h	asm-generic: rwsem: de-PPCify rwsem.h	2014-03-14 18:02:08 +00:00
scatterlist.h
sections.h	nosave: consolidate __nosave_{begin,end} in <asm/sections.h>	2014-10-09 22:26:04 -04: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	ARM: 7430/1: sizes.h: move from asm-generic to <linux/sizes.h>	2012-06-28 17:14:34 +01:00
spinlock.h
statfs.h	UAPI: (Scripted) Disintegrate include/asm-generic	2012-10-04 18:20:15 +01:00
string.h
switch_to.h	Split the switch_to() wrapper out of asm-generic/system.h	2012-03-28 18:30:03 +01:00
syscall.h	syscall_get_arch: remove useless function arguments	2014-03-20 10:11:59 -04:00
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	BUG: headers with BUG/BUG_ON etc. need linux/bug.h	2012-03-04 17:54:34 -05:00
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	asm-generic: allow generic unaligned access if the arch supports it	2014-05-08 10:22:23 +02:00
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	ARM: 8168/1: extend __init_end to a page align address	2014-10-02 21:28:16 +01:00
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: simplify big-endian zero_bytemask macro	2014-05-01 08:57:44 -07:00
xor.h	asm-generic: xor: mark static functions as __maybe_unused	2012-10-03 21:21:06 +02:00