Linus Walleij 9e9355bb20 pinctrl: bcm2835: Fix some merge fallout ...

Fixing a small merge problem in BCM2835 related to the
new irqchip code.

Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

2017-11-09 09:36:07 +01:00

..

accessibility

…

acpi

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

amba

…

android

ANDROID: binder: don't queue async transactions to thread.

2017-09-01 09:22:50 +02:00

ata

Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

2017-09-06 22:41:21 -07:00

atm

atm: make atmdev_ops const

2017-08-09 22:43:50 -07:00

auxdisplay

…

base

firmware: Restore support for built-in firmware

2017-09-16 10:58:48 -07:00

bcma

gpio: Move irqdomain into struct gpio_irq_chip

2017-11-08 14:06:21 +01:00

block

Merge tag 'ceph-for-4.14-rc1' of git://github.com/ceph/ceph-client

2017-09-12 20:03:53 -07:00

bluetooth

Bluetooth: hci_bcm: Handle empty packet after firmware loading

2017-08-17 22:51:50 +03:00

bus

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

2017-09-10 20:40:00 -07:00

cdrom

…

char

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

clk

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

2017-09-13 11:04:14 -07:00

clocksource

Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2017-09-15 20:43:33 -07:00

connector

…

cpufreq

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

cpuidle

Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2017-09-15 20:43:33 -07:00

crypto

Merge tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2017-09-07 14:03:05 -07:00

dax

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

2017-09-14 13:43:16 -07:00

dca

…

devfreq

PM / devfreq: Fix memory leak when fail to register device

2017-08-28 10:31:08 +09:00

dio

…

dma

Merge tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2017-09-07 14:03:05 -07:00

dma-buf

dma-buf: fix reservation_object_wait_timeout_rcu to wait correctly v2

2017-08-14 13:01:25 -04:00

edac

EDAC, mce_amd: Get rid of local var in amd_filter_mce()

2017-08-21 17:59:38 +02:00

eisa

…

extcon

extcon: max77693: Allow MHL attach notifier

2017-08-25 09:32:27 +09:00

firewire

…

firmware

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

fmc

drivers/fmc: carrier can program FPGA on registration

2017-08-28 16:24:22 +02:00

fpga

fpga: altera-hps2fpga: fix multiple init of l3_remap_lock

2017-08-10 14:27:55 -07:00

fsi

drivers/fsi/scom: Remove reset before every putscom

2017-08-28 17:15:16 +02:00

gpio

gpio: Fix undefined lock_dep_class

2017-11-08 21:40:41 +01:00

gpu

Merge tag 'drm-fixes-for-v4.14-rc1' of git://people.freedesktop.org/~airlied/linux

2017-09-15 17:52:52 -07:00

hid

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

2017-09-07 12:53:14 -07:00

hsi

…

hv

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

2017-09-07 09:25:15 -07:00

hwmon

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

hwspinlock

…

hwtracing

Merge tag 'stm-for-greg-20170825' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next

2017-08-28 16:58:19 +02:00

i2c

i2c: i2c-stm32f7: add driver

2017-09-14 17:34:43 +02:00

ide

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

2017-09-07 11:59:42 -07:00

idle

Merge tag 'pm-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2017-09-05 12:19:08 -07:00

iio

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

2017-09-07 13:51:13 -07:00

infiniband

IB/mlx4: fix sprintf format warning

2017-09-13 18:53:15 -07:00

input

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

2017-09-16 11:24:26 -07:00

iommu

Merge tag 'iommu-updates-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2017-09-09 15:03:24 -07:00

ipack

…

irqchip

Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2017-09-15 20:43:33 -07:00

isdn

isdn: isdnloop: fix logic error in isdnloop_sendbuf

2017-09-07 20:03:54 -07:00

leds

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

lightnvm

…

macintosh

powerpc/macintosh: constify wf_sensor_ops structures

2017-09-01 16:42:54 +10:00

mailbox

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

2017-09-07 13:23:37 -07:00

mcb

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

2017-09-05 11:08:17 -07:00

md

bitops: Introduce assign_bit()

2017-10-19 22:32:38 +02:00

media

Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-09-14 18:13:32 -07:00

memory

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

2017-09-10 20:40:00 -07:00

memstick

…

message

scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough

2017-08-29 21:51:45 -04:00

mfd

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

misc

mm: treewide: remove GFP_TEMPORARY allocation flag

2017-09-13 18:53:16 -07:00

mmc

mmc: renesas_sdhi: Add r8a7743/5 support

2017-09-01 15:31:01 +02:00

mtd

Merge tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs

2017-09-16 12:08:10 -07:00

mux

mux: make device_type const

2017-08-29 13:46:35 +02:00

net

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

2017-09-16 11:28:59 -07:00

nfc

…

ntb

…

nubus

…

nvdimm

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

2017-09-14 13:43:16 -07:00

nvme

nvme-pci: implement the HMB entry number and size limitations

2017-09-11 12:29:40 -04:00

nvmem

nvmem: core: remove unneeded NULL check

2017-08-28 17:33:23 +02:00

of

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

2017-09-12 13:30:06 -07:00

oprofile

…

parisc

parisc: Fix up devices below a PCI-PCI MegaRAID controller bridge

2017-08-24 18:46:44 +02:00

parport

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

2017-09-05 11:08:17 -07:00

pci

Revert "PCI: Avoid race while enabling upstream bridges"

2017-09-15 01:33:51 -05:00

pcmcia

MIPS: Alchemy: Threaded carddetect irqs for devboards

2017-08-29 15:21:53 +02:00

perf

…

phy

Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2017-09-15 20:43:33 -07:00

pinctrl

pinctrl: bcm2835: Fix some merge fallout

2017-11-09 09:36:07 +01:00

platform

gpio: Move irq_valid_mask into struct gpio_irq_chip

2017-11-08 14:10:18 +01:00

pnp

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

power

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

2017-09-09 14:44:39 -07:00

powercap

…

pps

drivers/pps: use surrounding "if PPS" to remove numerous dependency checks

2017-09-08 18:26:51 -07:00

ps3

…

ptp

ptp: make ptp_clock_info const

2017-08-22 11:04:51 -07:00

pwm

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

2017-09-11 13:04:32 -07:00

rapidio

…

ras

…

regulator

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

2017-09-07 13:51:13 -07:00

remoteproc

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

2017-09-09 14:34:38 -07:00

reset

Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2017-09-15 20:43:33 -07:00

rpmsg

rpmsg: glink: initialize ret to zero to ensure error status check is correct

2017-09-04 10:52:30 -07:00

rtc

Merge tag 'rtc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

2017-09-13 10:56:00 -07:00

s390

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

2017-09-12 06:01:59 -07:00

sbus

…

scsi

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

2017-09-13 10:47:14 -07:00

sfi

…

sh

…

sn

…

soc

Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2017-09-15 20:43:33 -07:00

spi

Merge tag 'acpi-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2017-09-05 12:45:03 -07:00

spmi

spmi: pmic-arb: Move the ownership check to irq_chip callback

2017-08-28 13:52:22 +02:00

ssb

…

staging

Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-09-14 18:54:01 -07:00

target

Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-09-14 18:13:32 -07:00

tc

…

tee

…

thermal

Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'const-thermal-zone-structure' into next

2017-09-08 11:20:04 +08:00

thunderbolt

Merge tag 'acpi-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2017-09-05 12:45:03 -07:00

tty

dmi: Mark all struct dmi_system_id instances const

2017-09-14 11:59:30 +02:00

uio

…

usb

Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-09-14 18:13:32 -07:00

uwb

uwb: lc-rc: constify attribute_group structures.

2017-08-10 11:31:27 -07:00

vfio

vfio: platform: constify amba_id

2017-08-30 14:03:42 -06:00

vhost

lib/interval_tree: fast overlap detection

2017-09-08 18:26:49 -07:00

video

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

2017-09-14 13:33:33 -07:00

virt

virt: Convert to using %pOF instead of full_name

2017-08-29 08:52:51 -05:00

virtio

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

2017-09-07 21:11:05 -07:00

vlynq

…

vme

…

w1

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

2017-09-09 14:44:39 -07:00

watchdog

Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2017-09-15 20:43:33 -07:00

xen

mm: treewide: remove GFP_TEMPORARY allocation flag

2017-09-13 18:53:16 -07:00

zorro

…

Kconfig

…

Makefile

x86/lguest: Remove lguest support

2017-08-24 09:57:28 +02:00