mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-04 22:54:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
e3cd6cf425bf40061418edf7b295f654301446fe
linux/drivers
History
Heiner Kallweit e3cd6cf425 spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error" 
Commit 5c0ba57744 ("spi: fsl-espi: avoid processing uninitalized
data on error") applied fine to stable but caused a merge conflict
on next. This patch fixes that.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2016-10-28 18:56:17 +01:00
..
accessibility
…
acpi
Merge tag 'acpi-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-10-14 12:50:05 -07:00
amba
…
android
…
ata
ahci: qoriq: Revert "ahci: qoriq: Disable NCQ on ls2080a SoC"
2016-09-30 10:28:51 +02:00
atm
…
auxdisplay
auxdisplay: img-ascii-lcd: driver for simple ASCII LCD displays
2016-10-06 17:03:41 +02:00
base
memory-hotplug: fix store_mem_state() return value
2016-10-07 18:46:28 -07:00
bcma
…
block
kthread: kthread worker API cleanup
2016-10-11 15:06:33 -07:00
bluetooth
Bluetooth: btusb: Fix atheros firmware download error
2016-10-07 09:46:56 +02:00
bus
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
cdrom
…
char
Merge tag 'gcc-plugins-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
2016-10-15 10:03:15 -07:00
clk
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:34:49 -07:00
clocksource
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
connector
…
cpufreq
Merge tag 'pm-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-10-14 12:46:13 -07:00
cpuidle
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-10-15 09:26:12 -07:00
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-10-10 14:04:16 -07:00
dax
Merge branch 'for-4.9/dax' into libnvdimm-for-next
2016-10-07 16:46:30 -07:00
dca
…
devfreq
PM / devfreq: Skip status update on uninitialized previous_freq
2016-10-11 00:01:20 +02:00
dio
…
dma
Merge tag 'dmaengine-4.9-rc1' of git://git.infradead.org/users/vkoul/slave-dma
2016-10-06 17:13:54 -07:00
dma-buf
Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux
2016-10-11 18:12:22 -07:00
edac
Merge tag 'edac_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2016-10-04 12:06:26 -07:00
eisa
…
extcon
…
firewire
…
firmware
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
fmc
…
fpga
…
gpio
gpio: pca953x: add a comment explaining the need for a lockdep subclass
2016-10-11 23:17:08 +02:00
gpu
Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux
2016-10-11 18:12:22 -07:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2016-10-07 11:58:38 -07:00
hsi
…
hv
Drivers: hv: get rid of id in struct vmbus_channel
2016-09-27 12:35:49 +02:00
hwmon
Merge tag 'hwmon-for-linus-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2016-10-04 10:56:14 -07:00
hwspinlock
…
hwtracing
…
i2c
Merge tag 'tegra-for-4.8-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into i2c/for-next
2016-10-11 23:37:26 +02:00
ide
…
idle
nmi_backtrace: generate one-line reports for idle cpus
2016-10-07 18:46:30 -07:00
iio
Merge tag 'staging-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2016-10-05 14:50:51 -07:00
infiniband
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
2016-10-14 13:43:08 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-10-14 13:19:30 -07:00
iommu
Merge tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2016-10-11 12:52:41 -07:00
ipack
…
irqchip
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-10-15 09:26:12 -07:00
isdn
…
leds
leds: triggers: Check return value of kobject_uevent_env()
2016-09-20 10:22:10 +02:00
lguest
…
lightnvm
Merge branch 'for-4.9/block' of git://git.kernel.dk/linux-block
2016-10-07 14:42:05 -07:00
macintosh
powerpc: Remove all usages of NO_IRQ
2016-09-20 20:57:12 +10:00
mailbox
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2016-10-06 17:36:53 -07:00
mcb
mcb: Add a dma_device to mcb_device
2016-09-27 12:33:47 +02:00
md
kthread: kthread worker API cleanup
2016-10-11 15:06:33 -07:00
media
Merge tag 'linux-kselftest-4.9-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
2016-10-14 15:17:12 -07:00
memory
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
memstick
…
message
…
mfd
Merge tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-10-07 08:35:35 -07:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
mmc
Merge tag 'usb-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2016-10-03 20:17:35 -07:00
mtd
Merge branch 'akpm' (patches from Andrew)
2016-10-11 17:34:10 -07:00
net
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
2016-10-14 13:43:08 -07:00
nfc
…
ntb
…
nubus
…
nvdimm
Merge branch 'for-4.9/dax' into libnvdimm-for-next
2016-10-07 16:46:30 -07:00
nvme
nvme: use the DMA_ATTR_NO_WARN attribute
2016-10-11 15:06:32 -07:00
nvmem
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
of
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-10-15 09:26:12 -07:00
oprofile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
parisc
…
parport
…
pci
Merge tag 'pci-v4.9-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2016-10-13 17:08:58 -07:00
pcmcia
pcmcia: soc_common: add driver-data pointer
2016-09-22 09:39:16 +01:00
perf
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
phy
…
pinctrl
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
platform
Merge tag 'platform-drivers-x86-v4.9-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2016-10-13 16:52:39 -07:00
pnp
…
power
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2016-10-06 18:21:15 -07:00
powercap
…
pps
pps: kc: fix non-tickless system config dependency
2016-10-11 15:06:32 -07:00
ps3
powerpc: Remove all usages of NO_IRQ
2016-09-20 20:57:12 +10:00
ptp
drivers/ptp: Fix kernel memory disclosure
2016-10-13 10:20:06 -04:00
pwm
…
rapidio
rapidio/rio_cm: use memdup_user() instead of duplicating code
2016-10-11 15:06:32 -07:00
ras
…
regulator
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2016-10-12 11:05:23 -07:00
remoteproc
Merge tag 'rpmsg-v4.9' of git://github.com/andersson/remoteproc
2016-10-06 17:03:49 -07:00
reset
…
rpmsg
…
rtc
Merge tag 'rtc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2016-10-14 13:13:44 -07:00
s390
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2016-10-07 09:28:53 -07:00
sbus
…
scsi
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2016-10-14 11:37:50 -07:00
sfi
…
sh
…
sn
…
soc
Merge tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2016-10-14 11:07:42 -07:00
spi
spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error"
2016-10-28 18:56:17 +01:00
spmi
spmi: pmic-arb: Return an error code if sanity check fails
2016-09-27 12:43:34 +02:00
ssb
…
staging
Merge branch 'akpm' (patches from Andrew)
2016-10-11 17:34:10 -07:00
target
…
tc
…
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2016-10-12 11:05:23 -07:00
thunderbolt
…
tty
kthread: kthread worker API cleanup
2016-10-11 15:06:33 -07:00
uio
…
usb
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-10-15 09:26:12 -07:00
uwb
…
vfio
vfio_pci: use pci_alloc_irq_vectors
2016-09-29 13:36:38 -06:00
vhost
…
video
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-10-15 09:26:12 -07:00
virt
…
virtio
…
vlynq
…
vme
vme: fake: remove unexpected unlock in fake_master_set()
2016-09-27 12:43:35 +02:00
w1
…
watchdog
Merge git://www.linux-watchdog.org/linux-watchdog
2016-10-13 16:44:20 -07:00
xen
Merge tag 'for-linus-4.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2016-10-06 11:19:10 -07:00
zorro
…
Kconfig
…
Makefile
clk: probe common clock drivers earlier
2016-09-23 13:00:04 +02:00