David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ...

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-07-20 21:17:12 -07:00

..

alchemy

Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2018-06-14 16:21:46 +09:00

ar7

MIPS: AR7: Constify gpio_led

2018-02-19 10:55:36 +00:00

ath25

MIPS: ath25: Check for kzalloc allocation failure

2018-02-23 09:35:54 +00:00

ath79

MIPS: pb44: Fix i2c-gpio GPIO descriptor table

2018-06-18 22:19:50 +01:00

bcm47xx

MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum

2018-06-18 22:19:50 +01:00

bcm63xx

MIPS: BCM63XX: kconfig: Remove blank help text

2018-02-02 23:53:10 +09:00

bmips

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

boot

Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

2018-06-12 12:56:02 -07:00

cavium-octeon

swiotlb: move the SWIOTLB config symbol to lib/Kconfig

2018-05-09 06:58:01 +02:00

cobalt

…

configs

Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

2018-06-12 12:56:02 -07:00

crypto

MIPS: crypto: Add crc32 and crc32c hw accelerated module

2018-02-19 20:50:36 +00:00

dec

MIPS: Convert update_persistent_clock() to update_persistent_clock64()

2018-05-14 23:58:23 +01:00

emma

MIPS: Avoid old-style declaration

2017-01-25 02:51:11 +01:00

fw

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

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

generic

MIPS: xilfpga: Actually include FDT in fitImage

2018-05-14 23:54:25 +01:00

include

net: Add a new socket option for a future transmit time.

2018-07-04 22:30:27 +09:00

jazz

MIPS: Set I/O port resource types correctly

2017-12-18 23:07:45 -06:00

jz4740

MIPS: JZ4740: Drop old platform reset code

2018-05-14 23:58:23 +01:00

kernel

MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()

2018-06-28 14:14:41 -07:00

kvm

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2018-06-12 11:34:04 -07:00

lantiq

MIPS: lantiq: ase: Enable MFD_SYSCON

2018-03-21 21:57:35 +00:00

lasat

MIPS: Convert update_persistent_clock() to update_persistent_clock64()

2018-05-14 23:58:23 +01:00

lib

MIPS: memset.S: Reinstate delay slot indentation

2018-05-21 16:01:15 +01:00

loongson32

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

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

loongson64

Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

2018-06-12 12:56:02 -07:00

math-emu

MIPS: math-emu: Mark fall throughs in switch statements with a comment

2017-12-12 17:20:20 +01:00

mm

MIPS: Fix ioremap() RAM check

2018-07-05 14:43:21 -07:00

mti-malta

MIPS: Convert read_persistent_clock() to read_persistent_clock64()

2018-05-14 23:58:23 +01:00

net

bpf, mips: remove unused function

2018-05-14 19:11:45 -07:00

netlogic

scatterlist: move the NEED_SG_DMA_LENGTH config symbol to lib/Kconfig

2018-05-09 06:55:59 +02:00

oprofile

MIPS: perf: More robustly probe for the presence of per-tc counters

2018-05-15 15:16:16 +01:00

paravirt

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

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

pci

Merge tag 'pci-v4.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2018-06-07 12:45:58 -07:00

pic32

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

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

pistachio

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

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

pmcs-msp71xx

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

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

pnx833x

mtd: nand: Rename nand.h into rawnand.h

2017-08-13 10:11:49 +02:00

power

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

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

ralink

MIPS: ralink: Fix booting on MT7621

2018-03-22 00:06:30 +00:00

rb532

MIPS: RB532: Avoid undefined mac_pton without GENERIC_NET_UTILS

2018-01-10 16:39:03 +01:00

sgi-ip22

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

sgi-ip27

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

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

sgi-ip32

mips: ip22/32: Convert timers to use timer_setup()

2017-11-02 15:50:36 -07:00

sibyte

Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

2018-06-12 12:56:02 -07:00

sni

MIPS: sni: Remove the read_persistent_clock()

2018-05-14 23:58:25 +01:00

tools

Update MIPS email addresses

2017-11-03 09:02:30 -07:00

txx9

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

vdso

MIPS: VDSO: Replace __mips_isa_rev with MIPS_ISA_REV

2018-03-09 11:22:48 +00:00

vr41xx

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

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

Kbuild

MIPS: Disable Werror when W= is set

2017-04-10 11:56:07 +02:00

Kbuild.platforms

MIPS: Xilfpga: Switch to using generic defconfigs

2017-11-08 22:54:14 +00:00

Kconfig

MIPS: Add support for restartable sequences

2018-06-19 21:13:17 -07:00

Kconfig.debug

MIPS: Fix CPS SMP NS16550 UART defaults

2018-01-10 16:44:49 +01:00

Makefile

kbuild: add machine size to CHECKFLAGS

2018-06-01 11:36:58 +09:00

Makefile.postlink

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

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