Michael Ellerman f1079d3a3d Merge branch 'fixes' into next ...

We ended up with an ugly conflict between fixes and next in ftrace.h
involving multiple nested ifdefs, and the automatic resolution is
wrong. So merge fixes into next so we can fix it up.

2018-06-03 20:32:02 +10:00

..

altera-stapl

…

c2port

kmemcheck: remove annotations

2017-11-15 18:21:04 -08:00

cardreader

Merge tag 'for-4.17/block-20180402' of git://git.kernel.dk/linux-block

2018-04-05 14:27:02 -07:00

cb710

…

cxl

Merge branch 'fixes' into next

2018-06-03 20:32:02 +10:00

echo

misc: Remove Blackfin DSP echo support

2018-03-26 15:56:37 +02:00

eeprom

Merge tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2018-04-04 20:07:20 -07:00

genwqe

GenWQE: Fix a typo in two comments

2018-03-27 09:51:22 +02:00

ibmasm

Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2017-11-15 10:14:11 -08:00

lis3lv02d

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

lkdtm

lkdtm: Add missing SPDX-License-Identifier line

2018-03-06 19:18:55 -08:00

mei

mei: remove dev_err message on an unsupported ioctl

2018-03-14 19:33:13 +01:00

mic

misc: mic: Release reference count and memory for VOP device

2018-03-15 18:12:01 +01:00

ocxl

Merge 4.16-rc7 into char-misc-next

2018-03-28 12:27:35 +02:00

sgi-gru

mm, mmu_notifier: annotate mmu notifiers with blockable invalidate callbacks

2018-01-31 17:18:38 -08:00

sgi-xp

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

ti-st

…

vmw_vmci

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

ad525x_dpot-i2c.c

…

ad525x_dpot-spi.c

…

ad525x_dpot.c

misc: ad525x_dpot: macros should not use a trailing semicolon

2017-12-18 16:02:26 +01:00

ad525x_dpot.h

misc: ad525x_dpot: Unnecessary space before function pointer arguments

2017-12-18 15:59:17 +01:00

apds990x.c

misc: apds990x: Missing a blank line after declarations.

2017-12-18 16:02:26 +01:00

apds9802als.c

…

aspeed-lpc-ctrl.c

misc: aspeed-lpc-ctrl: Enable FWH and A2H bridge cycles

2018-03-15 18:20:51 +01:00

aspeed-lpc-snoop.c

…

atmel_tclib.c

…

atmel-ssc.c

…

bh1770glc.c

…

cs5535-mfgpt.c

…

ds1682.c

misc: ds1682: Ignore update-in-progress ETC reads

2018-01-09 17:03:57 +01:00

dummy-irq.c

…

enclosure.c

misc: enclosure: Remove unnecessary error check

2017-12-07 18:45:31 +01:00

fsa9480.c

misc: fsa9480: Add blank line after declarations.

2018-01-09 17:03:57 +01:00

hmc6352.c

…

hpilo.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

hpilo.h

misc: hpilo: Use SPDX-License-Identifier

2017-12-07 18:45:31 +01:00

ics932s401.c

misc: ics932s401: open brace should be on the previous line

2017-12-18 16:00:57 +01:00

ioc4.c

…

isl29003.c

misc: isl29003: Missing a blank line after declarations

2017-12-07 18:45:31 +01:00

isl29020.c

…

Kconfig

misc: atmel: Remove CPU_AT32AP700X (AVR32) reference

2018-03-15 14:23:34 +01:00

kgdbts.c

misc: kgdbts: Display progress of asynchronous tests

2018-01-25 08:40:17 -06:00

lattice-ecp3-config.c

…

Makefile

lkdtm: Relocate code to subdirectory

2018-03-06 19:18:55 -08:00

pch_phub.c

…

pci_endpoint_test.c

misc: pci_endpoint_test: Handle 64-bit BARs properly

2018-04-03 12:38:06 +01:00

phantom.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

pti.c

drivers/misc/intel/pti: Rename the header file to free up the namespace

2017-12-17 12:52:34 +01:00

qcom-coincell.c

…

spear13xx_pcie_gadget.c

…

sram-exec.c

…

sram.c

…

sram.h

…

tifm_7xx1.c

…

tifm_core.c

…

tsl2550.c

…

vexpress-syscfg.c

misc: vexpress: Use PTR_ERR_OR_ZERO()

2017-12-07 18:45:31 +01:00

vmw_balloon.c

x86/virt: Add enum for hypervisors to replace x86_hyper

2017-11-10 10:03:12 +01:00