diff --git a/[refs] b/[refs]
index d955e4b4e178..c8e7f10b58a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b2becc8cffdccdd60c63099f592ddd35aa6c34f
+refs/heads/master: c69ad71bcdecbaab82cfacb1dc967bd7fd967a3b
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 152abfd3589f..0314074fa232 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -323,7 +323,8 @@ static int __irq_set_trigger(struct irq_chip *chip, unsigned int irq,
 	ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK);
 
 	if (ret)
-		pr_err("setting flow type for irq %u failed (%pF)\n",
+		pr_err("setting trigger mode %d for irq %u failed (%pF)\n",
+				(int)(flags & IRQF_TRIGGER_MASK),
 				irq, chip->set_type);
 
 	return ret;