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

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 0ea328e71ec9..a4d5eb37744a 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -95,6 +95,13 @@ struct gpio_irq_chip {
         unsigned int num_parents;
 
         /**
+         * @parent_irq:
+         *
+         * For use by gpiochip_set_cascaded_irqchip()
+         */
+        unsigned int parent_irq;
+
+        /**
          * @parents:
          *
          * A list of interrupt parents of a GPIO chip. This is owned by the