Merge branch 'linus' into core/iommu

Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index d41b9f6f7903..33a9351c896d 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -473,6 +473,12 @@ void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
         unsigned long flags;
 
         spin_lock_irqsave(&sysrq_key_table_lock, flags);
+        /*
+         * Raise the apparent loglevel to maximum so that the sysrq header
+         * is shown to provide the user with positive feedback.  We do not
+         * simply emit this at KERN_EMERG as that would change message
+         * routing in the consumers of /proc/kmsg.
+         */
         orig_log_level = console_loglevel;
         console_loglevel = 7;
         printk(KERN_INFO "SysRq : ");