1. 12 Nov, 2008 1 commit
  2. 23 Oct, 2008 39 commits
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · f8aea200
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (21 commits)
        [SCSI] sd: fix computation of the full size of the device
        [SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact
        [SCSI] sun3x_esp: Convert && to ||
        [SCSI] sd: remove command-size switching code
        [SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API
        [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API
        [SCSI] fix netlink kernel-doc
        [SCSI] sd: Fix handling of NO_SENSE check condition
        [SCSI] export busy state via q->lld_busy_fn()
        [SCSI] refactor sdev/starget/shost busy checking
        [SCSI] mptfusion: Increase scsi-timeouts, similariy to the LSI 4.x driver.
        [SCSI] aic7xxx: Take the LED out of diagnostic mode on PM resume
        [SCSI] aic79xx: user visible misuse wrong SI units (not disk size!)
        [SCSI] ipr: use memory_read_from_buffer()
        [SCSI] aic79xx: fix shadowed variables
        [SCSI] aic79xx: fix shadowed variables, add statics
        [SCSI] aic7xxx: update *_shipped files
        [SCSI] aic7xxx: update .reg files
        [SCSI] aic7xxx: introduce "dont_generate_debug_code" keyword in aicasm parser
        [SCSI] scsi_dh: Initialize path state to be passive when path is not owned
        ...
      f8aea200
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · c3c9897c
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: fix section mismatch warning - apic_x2apic_phys
        x86: fix section mismatch warning - apic_x2apic_cluster
        x86: fix section mismatch warning - apic_x2apic_uv_x
        x86: fix section mismatch warning - apic_physflat
        x86: fix section mismatch warning - apic_flat
        x86: memtest fix use of reserve_early()
        x86 syscall.h: fix argument order
        x86/tlb_uv: remove strange mc146818rtc include
        x86: remove redundant KERN_DEBUG on pr_debug
        x86: do_boot_cpu - check if we have ESR register
        x86: MAINTAINERS change for AMD microcode patch loader
        x86/proc: fix /proc/cpuinfo cpu offline bug
        x86: call dmi-quirks for HP Laptops after early-quirks are executed
        x86, kexec: fix hang on i386 when panic occurs while console_sem is held
        MCE: Don't run 32bit machine checks with interrupts on
        x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC
        x86: make variables static
      c3c9897c
    • Len Brown's avatar
      staging: pcc_acpi: delete obsolete driver · f81db820
      Len Brown authored
      pcc_acpi is based on an old version
      of drivers/misc/panasonic-laptop.c
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      f81db820
    • Linus Torvalds's avatar
      Fix compile warning in kernel/params.c · d2441183
      Linus Torvalds authored
      Move free_module_param_attrs() into the CONFIG_MODULES section, since
      it's only used inside there. Thus avoiding the warning
      
        kernel/params.c:514: warning: 'free_module_param_attrs' defined but not used
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d2441183
    • Linus Torvalds's avatar
      Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc · 88ed86fe
      Linus Torvalds authored
      * 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc: (35 commits)
        proc: remove fs/proc/proc_misc.c
        proc: move /proc/vmcore creation to fs/proc/vmcore.c
        proc: move pagecount stuff to fs/proc/page.c
        proc: move all /proc/kcore stuff to fs/proc/kcore.c
        proc: move /proc/schedstat boilerplate to kernel/sched_stats.h
        proc: move /proc/modules boilerplate to kernel/module.c
        proc: move /proc/diskstats boilerplate to block/genhd.c
        proc: move /proc/zoneinfo boilerplate to mm/vmstat.c
        proc: move /proc/vmstat boilerplate to mm/vmstat.c
        proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c
        proc: move /proc/buddyinfo boilerplate to mm/vmstat.c
        proc: move /proc/vmallocinfo to mm/vmalloc.c
        proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c
        proc: move /proc/slab_allocators boilerplate to mm/slab.c
        proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c
        proc: move /proc/stat to fs/proc/stat.c
        proc: move rest of /proc/partitions code to block/genhd.c
        proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c
        proc: move /proc/devices code to fs/proc/devices.c
        proc: move rest of /proc/locks to fs/locks.c
        ...
      88ed86fe
    • Christoph Hellwig's avatar
      ext4: remove unused variable in ext4_get_parent · 3856d30d
      Christoph Hellwig authored
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      [ All users removed in "switch all filesystems over to d_obtain_alias",
        aka commit 44003728 ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3856d30d
    • Linus Torvalds's avatar
      pcc-acpi: fix compile with new stricter ACPI types · f3161f36
      Linus Torvalds authored
      This was another merge problem that wasn't a data conflict, but due to
      independent changes in two branches that just didn't work together.
      
      The pcc-acpi staging driver used
      
      	acpi_driver_data(device) = hotkey;
      
      to set driver data, but the ACPI merge made that invalid in commit
      db89b4f0 ("ACPI: catch calls of
      acpi_driver_data on pointer of wrong type"), and now you're supposed to
      just do.
      
      	device->driver_data = hotkey;
      
      instead.
      
      Fix it up.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f3161f36
    • Linus Torvalds's avatar
      ext3 quota support: fix compile failure · 12e1ec9f
      Linus Torvalds authored
      This one was due to a merge error: we added a use of nd.path in commit
      2d7c820e ("ext3: add checks for errors
      from jbd"), and concurrently we got rid of 'nd' and used a naked 'path'
      in commit 8264613d ("[PATCH] switch
      quota_on-related stuff to kern_path()").
      
      That all merged cleanly, but it didn't actually _work_.  This should fix
      it.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      12e1ec9f
    • Linus Torvalds's avatar
      Merge branch 'v28-range-hrtimers-for-linus-v2' of... · 1f6d6e8e
      Linus Torvalds authored
      Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
        hrtimers: add missing docbook comments to struct hrtimer
        hrtimers: simplify hrtimer_peek_ahead_timers()
        hrtimers: fix docbook comments
        DECLARE_PER_CPU needs linux/percpu.h
        hrtimers: fix typo
        rangetimers: fix the bug reported by Ingo for real
        rangetimer: fix BUG_ON reported by Ingo
        rangetimer: fix x86 build failure for the !HRTIMERS case
        select: fix alpha OSF wrapper
        select: fix alpha OSF wrapper
        hrtimer: peek at the timer queue just before going idle
        hrtimer: make the futex() system call use the per process slack value
        hrtimer: make the nanosleep() syscall use the per process slack
        hrtimer: fix signed/unsigned bug in slack estimator
        hrtimer: show the timer ranges in /proc/timer_list
        hrtimer: incorporate feedback from Peter Zijlstra
        hrtimer: add a hrtimer_start_range() function
        hrtimer: another build fix
        hrtimer: fix build bug found by Ingo
        hrtimer: make select() and poll() use the hrtimer range feature
        ...
      1f6d6e8e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · db563fc2
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: handle the TCP_Server_Info->tsk field more carefully
        cifs: fix unlinking of rename target when server doesn't support open file renames
        [CIFS] improve setlease handling
        [CIFS] fix saving of resume key before CIFSFindNext
        cifs: make cifs_rename handle -EACCES errors
        [CIFS] fix build error
        [CIFS] undo changes in cifs_rename_pending_delete if it errors out
        cifs: track DeletePending flag in cifsInodeInfo
        cifs: don't use CREATE_DELETE_ON_CLOSE in cifs_rename_pending_delete
        [CIFS] eliminate usage of kthread_stop for cifsd
        [CIFS] Add nodfs mount option
      db563fc2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · eb810715
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: aoa i2sbus: don't overwrite module parameter
        ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching
        ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver
        ALSA: Ensure PXA runtime data is initialised
        ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c
        ALSA: hda - Fix conflicting volume controls on ALC260
      eb810715
    • Linus Torvalds's avatar
      compat_blkdev_driver_ioctl: Remove unused variable warning · 5f4f0c4d
      Linus Torvalds authored
      Variable 'ret' is no longer used. Don't declare it.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5f4f0c4d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 54d822a6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: Fix GPIO initcall breakage
        avr32: Scale loops_per_jiffy when cpu frequency changes
        avr32: Fix bug in LCD pin setup on port C
        avr32: Add defconfig for the favr-32 board
        avr32: Add defconfig for the mimc200 board
        avr32: Add MIMC200 board support
        avr32: Fix MIMC200 board use of SPD network pins
        avr32: add support for EarthLCD Favr-32 board
        avr32: Add support for EVKLCD10X addon boards
        avr32: Kconfig: Remove pointless if around atstk1000 include
      54d822a6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev · 22484856
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev: (66 commits)
        [PATCH] kill the rest of struct file propagation in block ioctls
        [PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET
        [PATCH] get rid of blkdev_locked_ioctl()
        [PATCH] get rid of blkdev_driver_ioctl()
        [PATCH] sanitize blkdev_get() and friends
        [PATCH] remember mode of reiserfs journal
        [PATCH] propagate mode through swsusp_close()
        [PATCH] propagate mode through open_bdev_excl/close_bdev_excl
        [PATCH] pass fmode_t to blkdev_put()
        [PATCH] kill the unused bsize on the send side of /dev/loop
        [PATCH] trim file propagation in block/compat_ioctl.c
        [PATCH] end of methods switch: remove the old ones
        [PATCH] switch sr
        [PATCH] switch sd
        [PATCH] switch ide-scsi
        [PATCH] switch tape_block
        [PATCH] switch dcssblk
        [PATCH] switch dasd
        [PATCH] switch mtd_blkdevs
        [PATCH] switch mmc
        ...
      22484856
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 5ed487bc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (46 commits)
        [PATCH] fs: add a sanity check in d_free
        [PATCH] i_version: remount support
        [patch] vfs: make security_inode_setattr() calling consistent
        [patch 1/3] FS_MBCACHE: don't needlessly make it built-in
        [PATCH] move executable checking into ->permission()
        [PATCH] fs/dcache.c: update comment of d_validate()
        [RFC PATCH] touch_mnt_namespace when the mount flags change
        [PATCH] reiserfs: add missing llseek method
        [PATCH] fix ->llseek for more directories
        [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent
        [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup
        [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate()
        [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper
        [PATCH vfs-2.6 2/6] vfs: add d_ancestor()
        [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT()
        [PATCH] get rid of on-stack dentry in udf
        [PATCH 2/2] anondev: switch to IDA
        [PATCH 1/2] anondev: init IDR statically
        [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup()
        [PATCH] Optimise NFS readdir hack slightly.
        ...
      5ed487bc
    • Linus Torvalds's avatar
      Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 5b346539
      Linus Torvalds authored
      * 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
        x86: canonicalize remaining header guards
        x86: drop double underscores from header guards
        x86: Fix ASM_X86__ header guards
        x86, um: get rid of uml-config.h
        x86, um: get rid of arch/um/Kconfig.arch
        x86, um: get rid of arch/um/os symlink
        x86, um: get rid of excessive includes of uml-config.h
        x86, um: get rid of header symlinks
        x86, um: merge Kconfig.i386 and Kconfig.x86_64
        x86, um: get rid of sysdep symlink
        x86, um: trim the junk from uml ptrace-*.h
        x86, um: take vm-flags.h to sysdep
        x86, um: get rid of uml asm/arch
        x86, um: get rid of uml highmem.h
        x86, um: get rid of uml unistd.h
        x86, um: get rid of system.h -> system.h include
        x86, um: uml atomic.h is not needed anymore
        x86, um: untangle uml ldt.h
        x86, um: get rid of more uml asm/arch uses
        x86, um: remove dead header (uml module-generic.h; never used these days)
        ...
      5b346539
    • Takashi Iwai's avatar
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 765426e8
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
        dock: make dock driver not a module
        ACPI: fix ia64 build warning
        ACPI: hack around sysfs warning with link order
        ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
        intel_menlo: fix build warning
        panasonic-laptop: fix build
        ACPICA: Update version to 20080926
        ACPICA: Add support for zero-length buffer-to-string conversions
        ACPICA: New: Validation for predefined ACPI methods/objects
        ACPICA: Fix for implicit return compatibility
        ACPICA: Fixed a couple memory leaks associated with "implicit return"
        ACPICA: Optimize buffer allocation procedure
        ACPICA: Fix possible memory leak, error exit path
        ACPICA: Fix fault after mem allocation failure in AML parser
        ACPICA: Remove unused ACPI register bit definition
        ACPICA: Update version to 20080829
        ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
        ACPICA: Cleanup for internal Reference Object
        ACPICA: Update comments - no functional changes
        ACPICA: Update for Reference ACPI_OPERAND_OBJECT
        ...
      765426e8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 36ec8918
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
        sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().
        sh: mach-highlander: Handle SCIF pinmuxing on R7785RP.
        sh: sh7785 pinmux support
        sh: update defconfigs.
        sh: Kill off unused p1fc divisors from SH7763 clk fwk.
        sh: improve pinmux support for single direction pins
        sh: use 10MHz VIO_CLK for ov772x on Migo-R
        sh: Update gpio_set_value() pin value handling
        sh: update ov772x byte order on Migo-R
        rtc: Add R2025S/D comment to rs5c372 Kconfig entry.
        sh: Export cache flush routines needed by sh_eth on SH7619.
        sh: Wire up oops reporting in the die notifier chain.
        sh: ap325rxa: Kill off unused port definitions.
        sh: Hook up PB0->PB7 input-only pins in SH7203 PFC.
        sh: ap325rxa: Move off of hardcoded pinmux for flctl initialization.
        sh: add support FLCTL for ap325rxa board
        sh: gpio: Stub in dummy GPIO<->IRQ mapping routines.
        sh: rsk7203: leds-gpio support for RSK+ LEDs.
        sh: gpio: Include asm-generic/gpio.h for non-gpiolib stubs.
        sh: fix soc-camera compile breakage on Migo-R.
        ...
      36ec8918
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 70740d6c
      Linus Torvalds authored
      * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
        drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
        drm/i915: use pipes, not planes to label vblank data
        drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
        i915: Fix format string warnings on x86-64.
        i915: Don't dereference HWS in /proc debug files when it isn't initialized.
        i915: Enable IMR passthrough of vblank events before enabling it in pipestat.
        drm: Remove two leaks of vblank reference count in error paths.
        drm: fix leak of cliprects in drm_rmdraw()
        i915: Disable MSI on GM965 (errata says it doesn't work)
        drm: Set cliprects to NULL when changing drawable to having 0 cliprects.
        i915: Protect vblank IRQ reg access with spinlock
      70740d6c
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · a3415dc3
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (32 commits)
        PCI hotplug: fix logic in Compaq hotplug controller bus speed setup
        PCI: don't export linux/io.h from pci.h
        PCI: PCI_QUIRKS depends on PCI
        PCI hotplug: pciehp: poll data link layer link active
        PCI hotplug: pciehp: fix possible memory leak in pcie_init
        PCI: Workaround invalid P2P bridge bus numbers
        PCI Hotplug: fakephp: add duplicate slot name debugging
        PCI: Hotplug core: remove 'name'
        PCI: shcphp: remove 'name' parameter
        PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
        PCI: rpaphp: kmalloc/kfree slot->name directly
        PCI: pciehp: remove 'name' parameter
        PCI: ibmphp: stop managing hotplug_slot->name
        PCI: fakephp: remove 'name' parameter
        PCI, PCI Hotplug: introduce slot_name helpers
        PCI: cpqphp: stop managing hotplug_slot->name
        PCI: cpci_hotplug: stop managing hotplug_slot->name
        PCI: acpiphp: remove 'name' parameter
        PCI: prevent duplicate slot names
        PCI Hotplug: serialize pci_hp_register and pci_hp_deregister
        ...
      a3415dc3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · b4d0b08a
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: fix sparse warnings
        9p: rdma: RDMA Transport Support for 9P
        9p: fix format warning
        9p: fix debug build error
      b4d0b08a
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux · 33217379
      Linus Torvalds authored
      * 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
        nfsd: clean up expkey_parse error cases
        nfsd: Drop reference in expkey_parse error cases
        nfsd: Fix memory leak in nfsd_getxattr
        NFSD: Fix BUG during NFSD shutdown processing
      33217379
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · feeedc6c
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Add info->archdata field
        i2c: Inform about deprecated chips directory
        i2c: Use pci_ioremap_bar()
        Schedule removal of the legacy i2c device driver binding model
        i2c: Clean up <linux/i2c.h>
        i2c: Update and clean up writing-clients document
        i2c: Drop 2-byte address block transfer defines
        i2c: Delete legacy model documentation
        i2c: Constify i2c_get_clientdata's parameter
        i2c: Delete outdated client porting guide
        i2c: Make clear what the class field of i2c_adapter is good for
        i2c-algo-pcf: Fix typo in debugging log message
        i2c-algo-pcf: Add adapter hooks around xfer begin and end
        i2c-algo-pcf: Pass adapter data into ->waitforpin() method
        i2c-i801: Add support for Intel Ibex Peak
      feeedc6c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · a2702834
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        USB: don't rebind drivers after failed resume or reset
        USB: fix memory leak in cdc-acm
        USB: Unusual dev for Mio moov 330 gps
        USB: cdc-wdm: make module autoload work
        USB: Fix unneeded endpoint check in pxa27x_udc
        usb/gadget: fix kernel-doc warning
        USB: Speedtouch: add pre_reset and post_reset routines
        USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative
        USB: support Huawei data card product IDs
        USB: add ZTE MF626 USB GSM modem entry
        USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge
        USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc
        USB: ohci: add support for tmio-ohci cell
      a2702834
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 45432371
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (42 commits)
        Staging: usbip: fix build warning on 64bit kernels
        Staging: me4000: remove some compiler warnings
        Staging: wbusb: fix a bunch of compiler warnings
        Staging: w35und: module init cleanup
        Staging: w35und: use gotos for error handling
        Staging: w35und: remove spinlock wrappers
        Staging: sxg: fix compiler warnings.
        Staging: sxg: fix up unused function warnings
        Staging: sxg: clean up C99 comments
        Staging: Lindent the echo driver
        Staging: SLICOSS: Free multicast list at driver exit
        Staging: PCC-ACPI: Fix all checkpatch errors
        Staging: pcc-acpi: update to latest version
        Staging: Clean up sxg driver
        Staging: remove remaining uses of __FUNCTION__
        Staging: add poch driver
        Staging: wlan-ng: fix build error if wireless networking is not enabled
        Staging: echo: remove annoying "end of function" markers
        Staging: echo: remove __cplusplus macro magic
        Staging: echo: remove dead code
        ...
      45432371
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile · 92fb83af
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (21 commits)
        OProfile: Fix buffer synchronization for IBS
        oprofile: hotplug cpu fix
        oprofile: fixing whitespaces in arch/x86/oprofile/*
        oprofile: fixing whitespaces in arch/x86/oprofile/*
        oprofile: fixing whitespaces in drivers/oprofile/*
        x86/oprofile: add the logic for enabling additional IBS bits
        x86/oprofile: reordering functions in nmi_int.c
        x86/oprofile: removing unused function parameter in add_ibs_begin()
        oprofile: more whitespace fixes
        oprofile: whitespace fixes
        OProfile: Rename IBS sysfs dir into "ibs_op"
        OProfile: Rework string handling in setup_ibs_files()
        OProfile: Rework oprofile_add_ibs_sample() function
        oprofile: discover counters for op ppro too
        oprofile: Implement Intel architectural perfmon support
        oprofile: Don't report Nehalem as core_2
        oprofile: drop const in num counters field
        Revert "Oprofile Multiplexing Patch"
        x86, oprofile: BUG: using smp_processor_id() in preemptible code
        x86/oprofile: fix on_each_cpu build error
        ...
      
      Manually fixed trivial conflicts in
      	drivers/oprofile/{cpu_buffer.c,event_buffer.h}
      92fb83af
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · a5344876
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        stop_machine: fix error code handling on multiple cpus
        stop_machine: use workqueues instead of kernel threads
        workqueue: introduce create_rt_workqueue
        Call init_workqueues before pre smp initcalls.
        Make panic= and panic_on_oops into core_params
        Make initcall_debug a core_param
        core_param() for genuinely core kernel parameters
        param: Fix duplicate module prefixes
        module: check kernel param length at compile time, not runtime
        Remove stop_machine during module load v2
        module: simplify load_module.
      a5344876
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 296e1ce0
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (36 commits)
        V4L/DVB (9336): cx88: always de-alloc frontends on fault condition
        V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator
        V4L/DVB (9334): cx88: dvb_remove debug output
        V4L/DVB (9333): cx88: Not all boards that requires cx88-mpeg has frontends
        V4L/DVB (9332): cx88: initial fix for analogue only compilation
        V4L/DVB (9331): Remove unused inode parameter from video_ioctl2
        V4L/DVB (9330): Get rid of inode parameter at v4l_compat_translate_ioctl()
        V4L/DVB (9328): ivtvfb: FB_BLANK_POWERDOWN turns off video output
        V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d
        V4L/DVB (9326): ivtv: avoid green flashing when loading ivtv
        V4L/DVB (9325): ivtv: switch to unlocked_ioctl.
        V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support.
        V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls.
        V4L/DVB (9322): v4l2-int-if: Export more interfaces to modules
        V4L/DVB (9321): v4l2-int-if: Define new power state changes
        V4L/DVB (9320): v4l2: Add 10-bit RAW Bayer formats
        V4L/DVB (9319): v4l2-int-if: Add cropcap, g_crop and s_crop commands.
        V4L/DVB (9318): v4l2-int-if: Add command to get slave private data.
        V4L/DVB (9316): s5h1411: Power down s5h1411 when not in use
        V4L/DVB (9315): s5h1411: Skip reconfiguring demod modulation if already at the desired modulation
        ...
      296e1ce0
    • Linus Torvalds's avatar
      Merge branch 'v28-timers-for-linus' of... · b14ea38e
      Linus Torvalds authored
      Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        NOHZ: fix thinko in the timer restart code path
      b14ea38e
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/iommu-2.6 · 6770ab5c
      Linus Torvalds authored
      * git://git.infradead.org/iommu-2.6:
        Admit to maintaining VT-d, for my sins.
        dmar: fix uninitialised 'ret' variable in dmar_parse_dev()
        intel-iommu: use coherent_dma_mask in alloc_coherent
        amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors
        intel-iommu: IA64 support
        dmar: remove the quirk which disables dma-remapping when intr-remapping enabled
        dmar: Use queued invalidation interface for IOTLB and context invalidation
        dmar: context cache and IOTLB invalidation using queued invalidation
        dmar: use spin_lock_irqsave() in qi_submit_sync()
      6770ab5c
    • Linus Torvalds's avatar
      326528a5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · 3e5cce62
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
        dm: tidy local_init
        dm: remove unused flush_all
        dm raid1: separate region_hash interface part1
        dm: mark split bio as cloned
        dm crypt: remove waitqueue
        dm crypt: fix async split
        dm crypt: tidy sector
        dm: remove dm header from targets
        dm: publish array_too_big
        dm exception store: fix misordered writes
        dm exception store: refactor zero_area
        dm snapshot: drop unused last_percent
        dm snapshot: fix primary_pe race
        dm kcopyd: avoid queue shuffle
      3e5cce62
    • H. Peter Anvin's avatar
      [SCSI] sd: fix computation of the full size of the device · 520a2c27
      H. Peter Anvin authored
      When computing the full size of the device, we need to cast
      sdkp->capacity before shifting, since in some configurations sector_t
      can be a 32-bit number.
      
      Also, change ffz(~x) to the more idiomatic ilog2(x).
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
      520a2c27
    • H. Peter Anvin's avatar
      [SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact · a8659597
      H. Peter Anvin authored
      We would hang forever when passing a zero to string_get_size().
      Furthermore, string_get_size() would produce decimals on a value small
      enough to be exact.  Finally, a few formatting issues are inconsistent
      with standard SI style guidelines.
      
      - If the value is less than the divisor, skip the entire rounding
        step.  This prints out all small values including zero as integers,
        without decimals.
      - Add a space between the value and the symbol for the unit,
        consistent with standard SI practice.
      - Lower case k in kB since we are talking about powers of 10.
      - Finally, change "int" to "unsigned int" in one place to shut up a
        gcc warning when compiling the code out-of-kernel for testing.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
      a8659597
    • Julia Lawall's avatar
      [SCSI] sun3x_esp: Convert && to || · 3fe68cc1
      Julia Lawall authored
      The pattern !E && !E->fld is nonsensical.  The patch below updates this
      according to the assumption that && should be ||.  But perhaps another
      solution was intended.
      
      The semantic patch that makes this change is as follows:
      (http://www.emn.fr/x-info/coccinelle/)
      
      // <smpl>
      @disable and_comm@
      expression E;
      identifier fld;
      @@
      
      - !E && !E->fld
      + !E || !E->fld
      // </smpl>
      Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
      Acked-By: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
      3fe68cc1
    • Alan Stern's avatar
      [SCSI] sd: remove command-size switching code · d4c9b736
      Alan Stern authored
      This patch (as1138) removes from sd.c some old code for switching from
      10-byte commands to 6-byte commands.  This code is redundant -- the
      switching for READ and WRITE is already handled in
      scsi_io_completion() and the switching for MODE SENSE is already
      handled in scsi_mode_sense().  (There is no comparable switch for MODE
      SELECT, but I doubt one is needed.)
      
      Furthermore the other handlers do a better job; they check for
      appropriate ASC and ASCQ values before blindly switching the size.
      The code in sd.c is known to cause problems with some devices by
      switching when it shouldn't.
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
      d4c9b736
    • FUJITA Tomonori's avatar
      [SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API · 36a52920
      FUJITA Tomonori authored
      Since the commit 50bed2e2 (sg: disable
      interrupts inside sg_copy_buffer), no need to disable interrupts
      before calling scsi_sg_copy_from_buffer. So we can simplify
      twa_scsiop_execute_scsi_complete() a bit, which disables interrupts
      just for scsi_sg_copy_from_buffer.
      Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Acked-by: default avatarAdam Radford <linuxraid@amcc.com>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
      36a52920