1. 28 Apr, 2007 28 commits
  2. 27 Apr, 2007 12 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 94015530
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SCSI] esp_scsi.c: Fix compilation.
      94015530
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 42fae7fb
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Fix networking compilation errors
        [AF_RXRPC/AFS]: Arch-specific fixes.
        [AFS]: Fix VLocation record update wakeup
        [NET]: Revert sk_buff walker cleanups.
      42fae7fb
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · f0054636
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (46 commits)
        [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init()
        [MTD] [NAND] CM-x270 MTD driver
        [MTD] [NAND] Wrong calculation of page number in nand_block_bad()
        [MTD] [MAPS] fix plat-ram printk format
        [JFFS2] Fix compr_rubin.c build after include file elimination.
        [JFFS2] Handle inodes with only a single metadata node with non-zero isize
        [JFFS2] Tidy up licensing/copyright boilerplate.
        [MTD] [OneNAND] Exit loop only when column start with 0
        [MTD] [OneNAND] Fix access the past of the real oobfree array
        [MTD] [OneNAND] Update Samsung OneNAND official URL
        [JFFS2] Better fix for all-zero node headers
        [JFFS2] Improve read_inode memory usage, v2.
        [JFFS2] Improve failure mode if inode checking leaves unchecked space.
        [JFFS2] Fix cross-endian build.
        [MTD] Finish conversion mtd_blkdevs to use the kthread API
        [JFFS2] Obsolete dirent nodes immediately on unlink, where possible.
        Use menuconfig objects: MTD
        [MTD] mtd_blkdevs: Convert to use the kthread API
        [MTD] Fix fwh_lock locking
        [JFFS2] Speed up mount for directly-mapped NOR flash
        ...
      f0054636
    • Adrian Bunk's avatar
      [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init() · 28b57cdd
      Adrian Bunk authored
      This patch converts the pci_module_init() usage to pci_register_driver().
      
      It's currently #if 0'ed, but still not a bad idea to change it.
      Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
      28b57cdd
    • David Howells's avatar
      [NET]: Fix networking compilation errors · b8b8fd2d
      David Howells authored
      Fix miscellaneous networking compilation errors.
      
       (*) Export ktime_add_ns() for modules.
      
       (*) wext_proc_init() should have an ANSI declaration.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b8b8fd2d
    • David Howells's avatar
      [AF_RXRPC/AFS]: Arch-specific fixes. · b1bdb691
      David Howells authored
      Fixes for various arch compilation problems:
      
       (*) Missing module exports.
      
       (*) Variable name collision when rxkad and af_rxrpc both built in
           (rxrpc_debug).
      
       (*) Large constant representation problem (AFS_UUID_TO_UNIX_TIME).
      
       (*) Configuration dependencies.
      
       (*) printk() format warnings.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1bdb691
    • David Howells's avatar
      [AFS]: Fix VLocation record update wakeup · 47051a21
      David Howells authored
      Fix the wakeup transitions after a VLocation record update completes
      one way or another.  This builds on Dave Miller's partial fix.
      
      Also move wakeups outside the spinlocked sections.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      47051a21
    • David S. Miller's avatar
      [NET]: Revert sk_buff walker cleanups. · 1a028e50
      David S. Miller authored
      This reverts eefa3906
      
      The simplification made in that change works with the assumption that
      the 'offset' parameter to these functions is always positive or zero,
      which is not true.  It can be and often is negative in order to access
      SKB header values in front of skb->data.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1a028e50
    • Alexey Dobriyan's avatar
      [SCSI] esp_scsi.c: Fix compilation. · e1f2a094
      Alexey Dobriyan authored
      irqreturn.h for irqreturn_t and dma_addr_t being u128 warnings ;-)
      Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e1f2a094
    • Mike Rapoport's avatar
      [MTD] [NAND] CM-x270 MTD driver · 54d33c4c
      Mike Rapoport authored
      This patch provides MTD support for NAND flash devices on CM-x270 modules.
      Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
      Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
      54d33c4c
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 50f732ee
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (78 commits)
        USB: update MAINAINERS and CREDITS for Freescale USB driver
        USB: update gadget files for fsl_usb2_udc driver
        USB: add Freescale high-speed USB SOC device controller driver
        USB: quirk for broken suspend of IT8152F/G
        USB: iowarrior.c: timeouts too small in usb_control_msg calls
        USB: dell device id for option.c
        USB: Remove Huawei unusual_devs entry
        USB: CP2101 New Device IDs
        USB: add picdem device to ldusb
        usbfs micro optimitation
        USB: remove ancient/broken CRIS hcd
        usb ethernet gadget, workaround network stack API glitch
        USB: add "busnum" attribute for USB devices
        USB: cxacru: ADSL state management
        usbatm: Detect usb device shutdown and ignore failed urbs
        USB: Remove duplicate define of OHCI_QUIRK_ZFMICRO
        USB: BandRich BandLuxe HSDPA Data Card Driver
        USB gadget rndis: fix struct rndis_packet_msg_type unaligned bug
        USB Elan FTDI: check for driver registration status
        USB: sierra: add more checks on shutdown
        ...
      50f732ee
    • Linus Torvalds's avatar
      Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb · aa5bc2b5
      Linus Torvalds authored
      * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (184 commits)
        V4L/DVB (5563): Radio-maestro.c Replace radio_ioctl to use video_ioctl2
        V4L/DVB (5562): Radio-gemtek-pci.c Replace gemtek_pci_ioctl to use video_ioctl2
        V4L/DVB (5560): Ivtv: fix incorrect bitwise-and for command flags.
        V4L/DVB (5558): Opera: use 7-bit i2c addresses
        V4L/DVB (5557): Cafe_ccic: check return value of pci_enable_device
        V4L/DVB (5556): Radio-gemtek.c Replace gemtek_ioctl to use video_ioctl2
        V4L/DVB (5555): Radio-aimslab.c Replace rt_ioctl to use video_ioctl2
        V4L/DVB (5554): Fix: vidioc_g_parm were not zeroing the memory
        V4L/DVB (5553): Replace typhoon_do_ioctl to use video_ioctl2
        V4L/DVB (5552): Plan-b: Switch to refcounting PCI API
        V4L/DVB (5551): Plan-b: header change
        V4L/DVB (5550): Radio-sf16fmi.c Replace fmi_do_ioctl to use video_ioctl2
        V4L/DVB (5549): Radio-sf16fmr2.c Replace fmr2_do_ioctl to use video_ioctl2
        V4L/DVB (5548): Fix v4l2 buffer to the length
        V4L/DVB (5547): Add ENUM_FRAMESIZES and ENUM_FRAMEINTERVALS ioctls
        V4L/DVB (5546): Radio-terratec.c Replace tt_do_ioctl to use video_ioctl2
        V4L/DVB (5545): Saa7146: Release capture buffers on device close
        V4L/DVB (5544): Budget-av: Make inversion setting configurable, add KNC ONE V1.0 card
        V4L/DVB (5543): Tda10023: Add support for frontend TDA10023
        V4L/DVB (5542): Budget-av: Remove polarity switching of the clock for DVB-C
        ...
      aa5bc2b5