Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 944eaeb8e0cf..1e456dca4f60 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -209,11 +209,10 @@ static int xen_hvm_console_init(void)
                 info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
                 if (!info)
                         return -ENOMEM;
-        }
-
-        /* already configured */
-        if (info->intf != NULL)
+        } else if (info->intf != NULL) {
+                /* already configured */
                 return 0;
+        }
         /*
          * If the toolstack (or the hypervisor) hasn't set these values, the
          * default value is 0. Even though mfn = 0 and evtchn = 0 are
@@ -259,12 +258,10 @@ static int xen_pv_console_init(void)
                 info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
                 if (!info)
                         return -ENOMEM;
-        }
-
-        /* already configured */
-        if (info->intf != NULL)
+        } else if (info->intf != NULL) {
+                /* already configured */
                 return 0;
-
+        }
         info->evtchn = xen_start_info->console.domU.evtchn;
         info->intf = mfn_to_virt(xen_start_info->console.domU.mfn);
         info->vtermno = HVC_COOKIE;