Dan Carpenter 16ae30ea17 mei: fix an && vs || typo ...

->dev_state can't be both MEI_DEV_RESETTING and MEI_DEV_POWER_DOWN at
the same time.  && was clearing intended here.

Fixes: 8d52af6795 ("mei: speed up the power down flow")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2018-01-09 17:52:58 +01:00

..

accessibility

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

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

acpi

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2017-12-23 13:47:22 -08:00

amba

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping

2017-11-14 16:54:12 -08:00

android

android: binder: Prefer __func__ to using hardcoded function name

2018-01-09 17:05:32 +01:00

ata

libata: sata_down_spd_limit should return if driver has not recorded sstatus speed

2017-12-04 13:57:03 -08:00

atm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-29 13:10:25 -08:00

auxdisplay

auxdisplay: img-ascii-lcd: Only build on archs that have IOMEM

2017-11-27 12:36:45 -08:00

base

Merge 4.15-rc6 into char-misc-next

2018-01-02 14:46:35 +01:00

bcma

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-11-15 11:56:19 -08:00

block

null_blk: unalign call_single_data

2017-12-20 13:16:33 -07:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-04 09:26:51 +09:00

bus

bus: arm-ccn: fix module unloading Error: Removing state 147 which has instances left.

2017-12-04 17:15:20 +00:00

cdrom

Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

2017-11-14 15:32:19 -08:00

char

Merge 4.15-rc6 into char-misc-next

2018-01-02 14:46:35 +01:00

clk

clk: use atomic runtime pm api in clk_core_is_enabled

2017-12-26 17:34:03 -08:00

clocksource

Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/urgent

2017-11-23 16:29:05 +01:00

connector

…

cpufreq

cpufreq: governor: Ensure sufficiently large sampling intervals

2017-12-18 12:09:39 +01:00

cpuidle

Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-11-16 12:47:46 -08:00

crypto

Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-11-16 12:47:46 -08:00

dax

device-dax: implement ->split() to catch invalid munmap attempts

2017-11-29 18:40:42 -08:00

dca

…

devfreq

Merge branches 'pm-devfreq' and 'pm-tools'

2017-11-13 01:41:39 +01:00

dio

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

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

dma

dmaengine: fsl-edma: disable clks on all error paths

2017-12-15 09:53:04 +05:30

dma-buf

Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2017-11-17 14:58:01 -08:00

edac

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

eisa

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

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

extcon

extcon: axp288: Handle reserved charger-type values better

2018-01-03 10:12:59 +09:00

firewire

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

firmware

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-12-10 08:26:59 -08:00

fmc

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

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

fpga

fpga: socfpga-a10: disable clk on error in socfpga_a10_fpga_probe()

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

fsi

fsi: Make FSI a menuconfig to ease disabling it all

2017-12-07 18:41:12 +01:00

gpio

genirq/irqdomain: Rename early argument of irq_domain_activate_irq()

2017-12-29 21:13:04 +01:00

gpu

Merge tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

2017-12-28 05:20:07 +10:00

hid

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

2017-12-30 10:16:51 -08:00

hsi

Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

2017-11-15 13:35:43 -08:00

hv

vmbus: unregister device_obj->channels_kset

2017-12-18 15:47:12 +01:00

hwmon

hwmon: Deal with errors from the thermal subsystem

2017-12-26 11:53:24 -08:00

hwspinlock

Merge tag 'hwlock-v4.15' of git://github.com/andersson/remoteproc

2017-11-17 20:16:20 -08:00

hwtracing

Merge 4.15-rc6 into char-misc-next

2018-01-02 14:46:35 +01:00

i2c

i2c: piix4: Fix port number check on release

2017-12-12 23:27:04 +01:00

ide

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

2017-11-19 08:04:41 -10:00

idle

Merge branch 'pm-cpuidle'

2017-11-13 01:34:14 +01:00

iio

iio: health: max30102: Temperature should be in milli Celsius

2017-12-02 11:15:14 +00:00

infiniband

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

2017-12-28 23:06:01 -08:00

input

treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts

2017-11-21 16:35:54 -08:00

iommu

genirq/irqdomain: Rename early argument of irq_domain_activate_irq()

2017-12-29 21:13:04 +01:00

ipack

…

irqchip

genirq/irqdomain: Rename early argument of irq_domain_activate_irq()

2017-12-29 21:13:04 +01:00

isdn

treewide: setup_timer() -> timer_setup() (2 field)

2017-11-21 15:57:09 -08:00

leds

led: core: Fix brightness setting when setting delay_off=0

2017-12-27 20:45:07 +01:00

lightnvm

lightnvm: Convert timers to use timer_setup()

2017-11-21 15:46:44 -08:00

macintosh

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

mailbox

Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujitsu/integration

2017-11-15 13:39:18 -08:00

mcb

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

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

md

Merge tag 'for-4.15/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

2017-12-15 12:53:37 -08:00

media

Merge tag 'media/v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2017-12-08 13:18:47 -08:00

memory

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-11-16 16:05:01 -08:00

memstick

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

message

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

mfd

kernel/irq: Extend lockdep class for request mutex

2017-12-28 12:26:35 +01:00

misc

mei: fix an && vs || typo

2018-01-09 17:52:58 +01:00

mmc

mmc: core: apply NO_CMD23 quirk to some specific cards

2017-12-11 13:43:27 +01:00

mtd

mtd: Fix mtd_check_oob_ops()

2017-12-18 09:16:35 +01:00

mux

mux: add SPDX identifiers to all mux source files

2018-01-09 16:51:44 +01:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-28 23:20:21 -08:00

nfc

treewide: setup_timer() -> timer_setup() (2 field)

2017-11-21 15:57:09 -08:00

ntb

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

nubus

Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2017-11-13 12:10:24 -08:00

nvdimm

libnvdimm, btt: Fix an incompatibility in the log layout

2017-12-21 14:59:27 -08:00

nvme

nvme: setup streams after initializing namespace head

2017-12-15 15:18:07 +01:00

nvmem

Merge 4.15-rc6 into char-misc-next

2018-01-02 14:46:35 +01:00

of

of_mdio / mdiobus: ensure mdio devices have fwnode correctly populated

2017-12-13 15:01:47 -05:00

opp

…

oprofile

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

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

parisc

parisc: Hide Diva-built-in serial aux and graphics card

2017-12-17 21:06:25 +01:00

parport

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

2017-11-16 09:10:59 -08:00

pci

Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-12-31 13:13:56 -08:00

pcmcia

drivers/pcmcia/sa1111_badge4.c: avoid unused function warning

2017-11-17 16:10:04 -08:00

perf

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

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

phy

phy: rcar-gen3-usb2: select USB_COMMON

2017-12-15 16:00:41 +05:30

pinctrl

genirq/irqdomain: Rename early argument of irq_domain_activate_irq()

2017-12-29 21:13:04 +01:00

platform

platform/x86: dell-wmi: check for kmalloc() errors

2017-12-11 17:26:03 -08:00

pnp

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

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

power

Merge tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

2017-11-15 13:37:15 -08:00

powercap

…

pps

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

ps3

…

ptp

Merge tag 'for-linus-4.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2017-11-16 13:06:27 -08:00

pwm

Merge tag 'pwm/for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2017-11-22 21:09:18 -10:00

rapidio

Merge branch 'akpm' (patches from Andrew)

2017-11-17 16:56:17 -08:00

ras

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

regulator

Merge tag 'mfd-next-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2017-11-16 09:15:57 -08:00

remoteproc

Merge tag 'rproc-v4.15' of git://github.com/andersson/remoteproc

2017-11-17 20:14:10 -08:00

reset

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-11-16 16:05:01 -08:00

rpmsg

Merge tag 'rpmsg-v4.15' of git://github.com/andersson/remoteproc

2017-11-17 20:12:08 -08:00

rtc

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

2017-11-25 08:37:16 -10:00

s390

s390/qeth: fix error handling in checksum cmd callback

2017-12-20 15:11:49 -05:00

sbus

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

2017-11-17 20:21:44 -08:00

scsi

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-12-30 14:31:30 -08:00

sfi

…

sh

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping

2017-11-14 16:54:12 -08:00

siox

siox: add gpio bus driver

2017-12-19 10:56:53 +01:00

slimbus

slimbus: qcom: add HAS_IOMEM dependency

2018-01-09 17:01:15 +01:00

sn

…

soc

meson-gx-socinfo: Fix package id parsing

2017-11-30 15:29:44 -08:00

soundwire

soundwire: select REGMAP_SOUNDWIRE

2018-01-09 17:01:16 +01:00

spi

Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/imx', 'spi/fix/rspi', 'spi/fix/sun4i' and 'spi/fix/xilinx' into spi-linus

2017-12-19 11:07:00 +00:00

spmi

…

ssb

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

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

staging

staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/device

2017-12-19 15:53:39 +01:00

target

block: fix blk_rq_append_bio

2017-12-18 13:55:43 -07:00

tc

…

tee

optee: fix invalid of_node_put() in optee_driver_init()

2017-11-29 10:24:57 +01:00

thermal

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2017-11-17 14:31:27 -08:00

thunderbolt

thunderbolt: Mask ring interrupt properly when polling starts

2017-12-16 16:37:51 +01:00

tty

n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD)

2017-12-21 11:19:22 +01:00

uio

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

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

usb

usb: xhci: Add XHCI_TRUST_TX_LENGTH for Renesas uPD720201

2017-12-27 15:24:27 +01:00

uwb

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

vfio

Merge tag 'vfio-v4.15-rc1' of git://github.com/awilliam/linux-vfio

2017-11-14 16:47:47 -08:00

vhost

vhost: fix skb leak in handle_rx()

2017-12-02 21:31:03 -05:00

video

Merge tag 'fbdev-v4.15' of git://github.com/bzolnier/linux

2017-11-20 21:50:24 -10:00

virt

virt: vbox: use %pap format for printing resource_size_t

2017-12-21 18:06:59 +01:00

virtio

virtio_mmio: fix devm cleanup

2017-12-14 21:01:40 +02:00

vlynq

…

vme

vme: Fix a possible sleep-in-atomic bug in vme_tsi148

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

w1

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

2017-11-16 09:10:59 -08:00

watchdog

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

xen

Merge tag 'for-linus-4.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2017-12-22 12:30:10 -08:00

zorro

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

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

Kconfig

soundwire: Add SoundWire bus type

2017-12-19 11:14:56 +01:00

Makefile

soundwire: Add SoundWire bus type

2017-12-19 11:14:56 +01:00