Permalink
Switch branches/tags
Commits on Apr 6, 2009
  1. Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

    torvalds committed Apr 6, 2009
    * 'linux-next' of git://git.infradead.org/ubifs-2.6:
      UBIFS: fix recovery bug
      UBIFS: add R/O compatibility
      UBIFS: fix compiler warnings
      UBIFS: fully sort GCed nodes
      UBIFS: fix commentaries
      UBIFS: introduce a helpful variable
      UBIFS: use KERN_CONT
      UBIFS: fix lprops committing bug
      UBIFS: fix bogus assertion
      UBIFS: fix bug where page is marked uptodate when out of space
      UBIFS: amend key_hash return value
      UBIFS: improve find function interface
      UBIFS: list usage cleanup
      UBIFS: fix dbg_chk_lpt_sz()
  2. Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

    torvalds committed Apr 6, 2009
    * 'linux-next' of git://git.infradead.org/ubi-2.6:
      UBI: add fsync capability
  3. exit_notify: kill the wrong capable(CAP_KILL) check

    utrace committed with torvalds Apr 6, 2009
    The CAP_KILL check in exit_notify() looks just wrong, kill it.
    
    Whatever logic we have to reset ->exit_signal, the malicious user
    can bypass it if it execs the setuid application before exiting.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Acked-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Merge git://git.infradead.org/mtd-2.6

    torvalds committed Apr 6, 2009
    * git://git.infradead.org/mtd-2.6: (53 commits)
      [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
      [MTD] [NOR] Fixup for Numonyx M29W128 chips
      [MTD] mtdpart: Make ecc_stats more realistic.
      powerpc/85xx: TQM8548: Update DTS file for multi-chip support
      powerpc: NAND: FSL UPM: document new bindings
      [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
      [MTD] [NAND] FSL-UPM: add multi chip support
      [MTD] [NOR] Add device parent info to physmap_of
      [MTD] [NAND] Add support for NAND on the Socrates board
      [MTD] [NAND] Add support for 4KiB pages.
      [MTD] sysfs support should not depend on CONFIG_PROC_FS
      [MTD] [NAND] Add parent info for CAFÉ controller
      [MTD] support driver model updates
      [MTD] driver model updates (part 2)
      [MTD] driver model updates
      [MTD] [NAND] move gen_nand's probe function to .devinit.text
      [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
      [MTD] fix use after free in register_mtd_blktrans
      [MTD] [MAPS] Drop now unused sharpsl-flash map
      [MTD] ofpart: Check name property to determine partition nodes.
      ...
    
    Manually fix trivial conflict in drivers/mtd/maps/Makefile
  5. LANANA: Fix dates

    Alan-Cox committed with torvalds Apr 6, 2009
    As noted by Janne Grunau it would be good if the date was also right.
    
    (Web site also resynched)
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. md/raid1: fix build breakage

    alexb0 committed with torvalds Apr 6, 2009
    Fix this build error:
    
      drivers/md/raid1.c: In function 'raid1_congested':
      drivers/md/raid1.c:589: error: 'BDI_write_congested' undeclared
    
    BDI_write_congested was changed in commit 1faa16d ("block: change the
    request allocation/congestion logic to be sync/async based")
    
    Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
    Cc: Neil Brown <neilb@suse.de>
    Cc: Jens Axboe <jens.axboe@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. 8250: Fix warning

    Alan-Cox committed with torvalds Apr 6, 2009
    The 8430 patch was short a const so caused a warning.
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. rio: addition has higher precedence than ?:

    RoelKluin committed with torvalds Apr 6, 2009
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. symbol: Remove various bits of left over junk

    Alan-Cox committed with torvalds Apr 6, 2009
    There are various bits of code here that are unfinished and instead of
    being harmless either confuse or spew stuff into the logs at higher than
    debug level. They can and should go away.
    
    Also remove the bogus use of tty->lowlatency. We fixed the need for this hack
    long ago (with the flip buffer rewrite) but people keep copying it into drivers.
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. tty: pl2303 needs identifiers for Siemens S81 as well as EF81

    Alan-Cox committed with torvalds Apr 6, 2009
    Closes bug 9065
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. cdc-acm: zydas 1602 identifier needed

    Alan-Cox committed with torvalds Apr 6, 2009
    Bugzilla #9095 and a couple of other confirmations
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. icom: remove unused variables

    Breno Leitao committed with torvalds Apr 6, 2009
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. mux: fix build problem

    alexb0 committed with torvalds Apr 6, 2009
    Fixes:
    
      In file included from drivers/serial/mux.c:37:
      include/linux/serial_core.h: In function 'uart_handle_sysrq_char':
      include/linux/serial_core.h:467: error: 'struct uart_port' has no member named 'sysrq'
      include/linux/serial_core.h:468: error: 'struct uart_port' has no member named 'sysrq'
    
    Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. jsm: Fix the return variable and removing the unused retval.

    Breno Leitao committed with torvalds Apr 6, 2009
    As it was, the retval was never returned, so its assignments were silly.
    Just consolidate everything to rc, and remove the unused retval variable.
    
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Alan Cox <alan@etchedpixels.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. jsm: define init function as __devinit

    Breno Leitao committed with torvalds Apr 6, 2009
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. mxser: remove tty_port_tty_get from mxser_check_modem_status

    jirislaby committed with torvalds Apr 6, 2009
    mxser_check_modem_status is called with tty parameter, so the
    reference should be increased by callers already -- for ioctl
    syscall it is held whole time gap since open to close, for
    interrupt, the reference count is increased in the irq handler.
    
    There is no tty_kref_put in that function, so this also fixes
    a refcounting bug.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. tty: moxa, fix refcounting in moxa_poll_port

    jirislaby committed with torvalds Apr 6, 2009
    There is missing tty_kref_put on some paths in moxa_poll_port,
    although the reference is always taken. Fix it.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Reported-by: Jan 'Yenya' Kasprzak <kas@fi.muni.cz>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. isicom: isicom kref leak fix

    Alan-Cox committed with torvalds Apr 6, 2009
    The isicom driver leaks a kref on the shutdown path. Drop the additional
    kref we took
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. ucc: Fix leaky error path

    Alan-Cox committed with torvalds Apr 6, 2009
    Found by Daniel Marjamäki using cppcheck
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. riscom8: Auto-load riscom8 module when device opened.

    Scott James Remnant committed with torvalds Apr 6, 2009
    The riscom8 module is missing the char-major-48-* alias that would cause
    it to be auto-loaded when a device of that type is opened.  This patch
    adds the alias.
    
    Signed-off-by: Scott James Remnant <scott@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. usb: Auto-load cdc_acm module when device opened.

    Scott James Remnant committed with torvalds Apr 6, 2009
    The cdc_acm module is missing the char-major-166-* alias that would
    cause it to be auto-loaded when a device of that type is opened.  This
    patch adds the alias.
    
    Signed-off-by: Scott James Remnant <scott@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. specialix: Auto-load specialix module when device opened.

    Scott James Remnant committed with torvalds Apr 6, 2009
    The specialix module is missing the char-major-75-* alias that would
    cause it to be auto-loaded when a device of that type is opened.  This
    patch adds the alias.
    
    Signed-off-by: Scott James Remnant <scott@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. cyclades: Auto-load cyclades module when device opened.

    Scott James Remnant committed with torvalds Apr 6, 2009
    The cyclades module is missing the char-major-19-* alias that would
    cause it to be auto-loaded when a device of that type is opened.  This
    patch adds the alias.
    
    Signed-off-by: Scott James Remnant <scott@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. applicom: Auto-load applicom module when device opened.

    Scott James Remnant committed with torvalds Apr 6, 2009
    The applicom module is missing the char-major-10-157 alias that would
    cause it to be auto-loaded when a device of that type is opened.  This
    patch adds the alias.
    
    Signed-off-by: Scott James Remnant <scott@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  25. blackfin: Subtract ANOMALY_05000230 on quot

    Graf Yang committed with torvalds Apr 6, 2009
    Fix bug - up arrow key works abnormal for bf561 ezkit board
    
    Signed-off-by: Graf Yang <graf.yang@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  26. Fix DMA rx ring buffer handling

    sonicz committed with torvalds Apr 6, 2009
    Reported-by: Qian Zhang <zhangq@sansitech.com>
    Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  27. blackfin: Fix tty compile error in PIO mode

    sonicz committed with torvalds Apr 6, 2009
    Fixes this compile issue:
    
      drivers/serial/bfin_5xx.c: In function bfin_serial_rx_chars:
      drivers/serial/bfin_5xx.c:178: error: struct uart_info has no member named tty
    
    Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  28. blackfin: Use unsigned long for flags with irq functions

    Mike Frysinger committed with torvalds Apr 6, 2009
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  29. blackfin: BF538/9 serial uart support

    mhennerich committed with torvalds Apr 6, 2009
    Enable third UART on BF538/9
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  30. 8250_pci: add support for National Instruments legacy 8420 RS232 boards

    Will Page committed with torvalds Apr 6, 2009
    Signed-off-by: Will Page <will.page@ni.com>
    Signed-off-by: Shawn Bohrer <shawn.bohrer@ni.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  31. 8250_pci: add support for National Instruments 843x RS232 devices

    Shawn Bohrer committed with torvalds Apr 6, 2009
    This implements basic support for all 843x RS232 devices, but does not
    add DMA support.  This means that sustained data transfers at high baud
    rates may not be possible on multiple ports simultaneously.
    
    Signed-off-by: Shawn Bohrer <shawn.bohrer@ni.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  32. serial: Update PNP IDs

    Matthew Garrett committed with torvalds Apr 6, 2009
    Add new Wacom device IDs to the 8250_pnp serial driver, to support
    autoconfig on some newer tablet PCs.  Also add a comment to clarify that
    the FUJ02E6 device is a custom protocol, not a Wacom tablet.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Alan Cox <alan@etchedpixels.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  33. 8250_pnp.c: add another Wacom tablet

    Danny Kukawka committed with torvalds Apr 6, 2009
    Add another serial Wacom tablet with pnp_id: WACF009.
    
    Signed-off-by: Danny Kukawka <dkukawka@suse.de>
    Signed-off-by: Alan Cox <alan@etchedpixels.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  34. Make CONFIG_SLOW_WORK an automatic rather than manual config option

    dhowells committed with torvalds Apr 6, 2009
    Make CONFIG_SLOW_WORK an automatic rather than manual config option so that
    people configuring their kernels don't have to make the choice.  It can be
    selected automatically by those things that require it (such as FS-Cache).
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Jeff Garzik <jgarzik@redhat.com>
    Acked-by: Kyle McMartin <kyle@mcmartin.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  35. FRV: Fix compile breakage

    Adrian Bunk committed with torvalds Apr 6, 2009
    This patch fixes the follwing build error caused by
    commit 7ca43e7
    (mm: use debug_kmap_atomic):
    
      ...
        AS      arch/frv/mm/tlb-miss.o
      In file included from
      arch/frv/mm/tlb-miss.S:13:
      ...
      Assembler messages:
      include/asm-generic/ioctl.h:73:
      Error: unrecognized instruction `extern unsigned int __invalid_size_argument_for_IO...'
      ...
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>