1. 25 Jul, 2011 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block · 8ded371f
      Linus Torvalds authored
      * 'for-3.1/drivers' of git://git.kernel.dk/linux-block:
        cciss: do not attempt to read from a write-only register
        xen/blkback: Add module alias for autoloading
        xen/blkback: Don't let in-flight requests defer pending ones.
        bsg: fix address space warning from sparse
        bsg: remove unnecessary conditional expressions
        bsg: fix bsg_poll() to return POLLOUT properly
      8ded371f
    • Linus Torvalds's avatar
      Merge branch 'for-3.1/core' of git://git.kernel.dk/linux-block · 096a705b
      Linus Torvalds authored
      * 'for-3.1/core' of git://git.kernel.dk/linux-block: (24 commits)
        block: strict rq_affinity
        backing-dev: use synchronize_rcu_expedited instead of synchronize_rcu
        block: fix patch import error in max_discard_sectors check
        block: reorder request_queue to remove 64 bit alignment padding
        CFQ: add think time check for group
        CFQ: add think time check for service tree
        CFQ: move think time check variables to a separate struct
        fixlet: Remove fs_excl from struct task.
        cfq: Remove special treatment for metadata rqs.
        block: document blk_plug list access
        block: avoid building too big plug list
        compat_ioctl: fix make headers_check regression
        block: eliminate potential for infinite loop in blkdev_issue_discard
        compat_ioctl: fix warning caused by qemu
        block: flush MEDIA_CHANGE from drivers on close(2)
        blk-throttle: Make total_nr_queued unsigned
        block: Add __attribute__((format(printf...) and fix fallout
        fs/partitions/check.c: make local symbols static
        block:remove some spare spaces in genhd.c
        block:fix the comment error in blkdev.h
        ...
      096a705b
    • Randy Dunlap's avatar
      iomap: make IOPORT/PCI mapping functions conditional · fea80311
      Randy Dunlap authored
      When CONFIG_PCI is not enabled, CONFIG_EISA=y, and CONFIG_GENERIC_IOMAP=y,
      drivers/net/3c59x.c build fails due to a recent small change to
      <asm-generic/iomap.h> that surrounds pci_iomap() and pci_iounmap() with
      #ifdef CONFIG_PCI/#endif.
      
      Since that patch to iomap.h looks correct, add stubs for pci_iomap() and
      pci_iounmap() with CONFIG_PCI is not enabled to fix the build errors.
      
        drivers/net/3c59x.c:1026: error: implicit declaration of function 'pci_iomap'
        drivers/net/3c59x.c:1038: error: implicit declaration of function 'pci_iounmap'
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Cc: Jonas Bonn <jonas@southpole.se>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fea80311
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 8405b044
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] s5pv210: make needlessly global symbols static
        [CPUFREQ] exynos4210: make needlessly global symbols static
        [CPUFREQ] S3C6410: Add some lower frequencies for 800MHz base clock operation
        [CPUFREQ] S5PV210: Add reboot notifier to prevent system hang
        [CPUFREQ] S5PV210: Adjust udelay prior to voltage scaling down
        [CPUFREQ] S5PV210: Lock a mutex while changing the cpu frequency
        [CPUFREQ] S5PV210: Add pm_notifier to prevent system unstable
        [CPUFREQ] S5PV210: Add arm/int voltage control support
        [CPUFREQ] S5PV210: Add additional symantics for "relation" in cpufreq with pm
        [CPUFREQ] S3C64xx: Notify transition complete as soon as frequency changed
        [CPUFREQ] S3C6410: Support 800MHz operation in cpufreq
        [CPUFREQ] s5pv210-cpufreq.c: Add missing clk_put
        [CPUFREQ] Move compile for S3C64XX cpufreq to /drivers/cpufreq
        [CPUFREQ] Remove some vi noise that escaped into the Makefile.
        [CPUFREQ] Move ARM Samsung cpufreq drivers to drivers/cpufreq/
        [CPUFREQ/S3C64xx] Move S3C64xx CPUfreq driver into drivers/cpufreq
        [CPUFREQ] Handle CPUs with different capabilities in acpi-cpufreq
      8405b044
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · ee05eff6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (145 commits)
        bnx2x: use pci_pcie_cap()
        bnx2x: fix bnx2x_stop_on_error flow in bnx2x_sp_rtnl_task
        bnx2x: enable internal target-read for 57712 and up only
        bnx2x: count statistic ramrods on EQ to prevent MC assert
        bnx2x: fix loopback for non 10G link
        bnx2x: dcb - send all unmapped priorities to same COS as L2
        iwlwifi: Fix build with CONFIG_PM disabled.
        gre: fix improper error handling
        ipv4: use RT_TOS after some rt_tos conversions
        via-velocity: remove duplicated #include
        qlge: remove duplicated #include
        igb: remove duplicated #include
        can: c_can: remove duplicated #include
        bnad: remove duplicated #include
        net: allow netif_carrier to be called safely from IRQ
        bna: Header File Consolidation
        bna: HW Error Counter Fix
        bna: Add HW Semaphore Unlock Logic
        bna: IOC Event Name Change
        bna: Mboxq Flush When IOC Disabled
        ...
      ee05eff6
    • Stephen Rothwell's avatar
      gma500: udlay(20000) is too large · 933b4473
      Stephen Rothwell authored
      So use mdelay(20) instead.  Fixes this build error:
      
        ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      933b4473
  2. 24 Jul, 2011 34 commits