Merge UML update

diff --cc arch/um/drivers/line.c
Simple merge

diff --cc arch/um/drivers/net_kern.c
Simple merge

diff --cc arch/um/drivers/port_kern.c
Simple merge

diff --cc arch/um/drivers/ssl.c
Simple merge

diff --cc arch/um/drivers/stdio_console.c
Simple merge

diff --cc arch/um/drivers/ubd_kern.c
index 6683cf007fb9659d603446ed49f89f771f395b75,fb7f065400b42ec01fda470a53f0b682d42b63bc..68c8e1ca81d15d5455d2ea13afe887d872da91cd
--- 1/arch/um/drivers/ubd_kern.c
--- 2/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@@ -394,9 -438,9 +430,9 @@@ static int ubd_add(int n
        u64 size;
  
        if (!dev->file)
-               return -1;
+               goto out;
  
 -      disk = alloc_disk();
 +      disk = alloc_disk(1 << UBD_SHIFT);
        if (!disk)
                return -1;
        disk->major = MAJOR_NR;
@@@ -640,12 -708,17 +698,11 @@@ static int ubd_open_dev(struct ubd *dev
  
  static int ubd_open(struct inode *inode, struct file *filp)
  {
 -      struct ubd *dev;
 -      int n, offset, err = 0;
 -
 -      n = DEVICE_NR(inode->i_rdev);
 -      dev = &ubd_dev[n];
 -      if(n > MAX_DEV)
 -              return -ENODEV;
 -
 -      offset = n << UBD_SHIFT;
 +      int n = DEVICE_NR(inode->i_rdev);
 +      struct ubd *dev = &ubd_dev[n];
 +      int err;
- 
        if(dev->is_dir == 1)
-               return(0);
+               goto out;
  
        if(dev->count == 0){
                dev->openflags = dev->boot_openflags;

diff --cc arch/um/kernel/process_kern.c
Simple merge

diff --cc arch/um/kernel/signal_user.c
Simple merge

diff --cc arch/um/kernel/time_kern.c
Simple merge

diff --cc arch/um/kernel/trap_user.c
Simple merge

diff --cc arch/um/kernel/tty_log.c
Simple merge

diff --cc arch/um/kernel/um_arch.c
Simple merge

diff --cc arch/um/kernel/user_util.c
Simple merge

diff --cc arch/um/ptproxy/proxy.c
Simple merge