diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
| commit | 5f6654094ff35a7a92eb76667788ef633595e4ea (patch) | |
| tree | 8404c5fb245cddbc6877b97a9bf53139c95da852 /kernel/irq/debugfs.c | |
| parent | 5105730fbf6789ff9e20837bdefe32e8ba133595 (diff) | |
| parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
Merge tag 'v4.18-rc3' into docs-next
-rc1 broke the docs build due to changes in the e100/e1000 drivers; -rc3
got the fixes via the networking tree. Pull in -rc3 so that the docs tree
can actually build the docs again.
Diffstat (limited to 'kernel/irq/debugfs.c')
| -rw-r--r-- | kernel/irq/debugfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/debugfs.c b/kernel/irq/debugfs.c index 4dadeb3d6666..6f636136cccc 100644 --- a/kernel/irq/debugfs.c +++ b/kernel/irq/debugfs.c @@ -55,6 +55,7 @@ static const struct irq_bit_descr irqchip_flags[] = { BIT_MASK_DESCR(IRQCHIP_SKIP_SET_WAKE), BIT_MASK_DESCR(IRQCHIP_ONESHOT_SAFE), BIT_MASK_DESCR(IRQCHIP_EOI_THREADED), + BIT_MASK_DESCR(IRQCHIP_SUPPORTS_LEVEL_MSI), }; static void |