Merge tag 'v4.14-rc8' into next

Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.

diff --cc drivers/input/mouse/elan_i2c_core.c
index c33f2cce6ba9584c845df6f8b6e92e7b393048b7,6d6b092e2da901969b8e3a2cfe65f2d0f2651098..2690a8223841402ab2cbfa3ea5d8a34a4232f19f
--- 1/drivers/input/mouse/elan_i2c_core.c
--- 2/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@@ -1259,8 -1255,10 +1259,9 @@@ static const struct acpi_device_id elan
        { "ELAN0602", 0 },
        { "ELAN0605", 0 },
        { "ELAN0608", 0 },
 -      { "ELAN0605", 0 },
        { "ELAN0609", 0 },
        { "ELAN060B", 0 },
+       { "ELAN0611", 0 },
        { "ELAN1000", 0 },
        { }
  };

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc drivers/media/pci/ttpci/av7110.h
Simple merge