• Linus Torvalds's avatar
    Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 1871e845
    Linus Torvalds authored
    Pull UML fixes from Richard Weinberger:
     "This patch set contains mostly fixes and cleanups.  The UML tty driver
      uses now tty_port and is no longer broken like hell  :-)"
    
    * 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
      um: Add arch/x86/um to MAINTAINERS
      um: pass siginfo to guest process
      um: fix ubd_file_size for read-only files
      um: pull interrupt_end() into userspace()
      um: split syscall_trace(), pass pt_regs to it
      um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs
      um: set BLK_CGROUP=y in defconfig
      um: remove count_lock
      um: fully use tty_port
      um: Remove dead code
      um: remove line_ioctl()
      TTY: um/line, use tty from tty_port
      TTY: um/line, add tty_port
    1871e845
line.c 16.1 KB