1. 26 5月, 2011 11 次提交
    • L
      Merge branch 'for-torvalds' of... · ad363e09
      Linus Torvalds 提交于
      Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
      
      * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        mach-ux500: voltage domain regulators for DB8500
        cpufreq: make DB8500 cpufreq driver compile
        cpufreq: update DB8500 cpufreq driver
        mach-ux500: move CPUfreq driver to cpufreq subsystem
        mfd: add DB5500 PRCMU driver
        mfd: update DB8500 PRCMU driver
        mach-ux500: move the DB8500 PRCMU driver to MFD
        mach-ux500: make PRCMU base address dynamic
        mach-ux500: rename PRCMU driver per SoC
        mach-ux500: update ASIC version detection
        mach-ux500: update SoC and board IRQ handling
        mach-ux500: update the DB5500 register file
        mach-ux500: update the DB8500 register file
      ad363e09
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · ed0795aa
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (37 commits)
        Blackfin: use new common PERCPU_INPUT define
        MAINTAINERS: Fix Analog Devices mailinglist address
        Blackfin: boards: update ASoC resources after machine driver overhaul
        Blackfin: work around anomaly 05000480
        Blackfin: fix addr type with bfin_write_{or,and} helpers
        Blackfin: convert /proc/sram to seq_file
        Blackfin: switch /proc/gpio to seq_file
        Blackfin: fix indentation with bfin_read() helper
        Blackfin: convert old cpumask API to new one
        Blackfin: don't touch task->cpus_allowed directly
        Blackfin: don't touch cpu_possible_map and cpu_present_map directly
        Blackfin: bf548-ezkit/bf561-ezkit: update nor flash layout
        Blackfin: initial perf_event support
        Blackfin: update anomaly lists to latest public info
        Blackfin: use on-chip reset func with newer parts
        Blackfin: bf533-stamp/bf537-stamp: drop ad1980 from defconfigs
        Blackfin: optimize MMR reads during startup a bit
        Blackfin: bf537: demux port H mask A and emac rx ints
        Blackfin: bf537: fix excessive gpio int demuxing
        Blackfin: bf54x: drop unused pm gpio handling
        ...
      ed0795aa
    • L
      Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 4e8a780e
      Linus Torvalds 提交于
      * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits)
        ARM: mach-shmobile: mackerel: add renesas_usbhs support for USB1
        ARM: mach-shmobile: Correct the G4EVM SDHI0 I/O range.
        ARM: arch-shmobile: sh7372: add renesas_usbhs irq support
        ARM: mach-shmobile: sh73a0: mark DMA slave ID 0 as invalid
        ARM: mach-shmobile: mark DMA slave ID 0 as invalid
        ARM: mach-shmobile: Enable DMAEngine for SDHI on AG5EVM
        ARM: mach-shmobile: Enable DMAEngine for MMCIF on AG5EVM
        ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC
        dmaengine: shdma: Update SH_DMAC_MAX_CHANNELS to 20
        dmaengine: shdma: Fix SH_DMAC_MAX_CHANNELS handling
        dmaengine: shdma: Make second memory window optional
        ARM: mach-shmobile: Tidy up after SH7372 pm changes.
        ARM: mach-shmobile: sh7372 Core Standby CPUIdle
        ARM: mach-shmobile: CPUIdle support
        ARM: mach-shmobile: sh7372 Core Standby Suspend-to-RAM
        ARM: mach-shmobile: Suspend-to-RAM support
        mailmap: Add entry for Damian Hobson-Garcia.
        ARM: switch mackerel to dynamically manage the platform camera
        ARM: mach-shmobile: Add SDHI support for AG5EVM and sh73a0
        ARM: arch-shmobile: Use multiple irq vectors for SDHI
        ...
      4e8a780e
    • T
      hrtimers: Fix typo causing erratic timers · 90ff1f30
      Thomas Gleixner 提交于
      commit 9ec26907 ("timerfd: Manage cancelable timers in timerfd")
      introduced a CONFIG_HIGHRES_TIMERS (should be CONFIG_HIGH_RES_TIMERS)
      typo, which caused applications depending on CLOCK_REALTIME timers to
      become sluggy due to the fact that the time base of the realtime
      timers was not updated when the wall clock time was set.
      
      This causes anything from 100% CPU use for some applications to odd
      delays and hickups.
      Reported-bisected-and-tested-by: NAnca Emanuel <anca.emanuel@gmail.com>
      Tested-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Fatfingered-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      90ff1f30
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 51b550a4
      Linus Torvalds 提交于
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        export_report: use warn() to issue WARNING, so they go to stderr
        export_report: sort SECTION 2 output
        export_report: do collectcfiles work in perl itself
        kbuild: make versioncheck work in KBUILD_OUTDIR
        kbuild: make includecheck work in KBUILD_OUTDIR
        kbuild: make headerdep work in KBUILD_OUTDIR
        kbuild: add targets to PHONY
        kbuild: don't warn about include/linux/version.h not including itself
        eradicate bashisms in scripts/patch-kernel
      51b550a4
    • L
      Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 62af8163
      Linus Torvalds 提交于
      * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        kbuild: Create a kernel-headers RPM
        rpm-pkg: Fix when current directory is a symlink
        Replace '-' in kernel version with '_'
      62af8163
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 57bb5595
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (23 commits)
        ceph: fix cap flush race reentrancy
        libceph: subscribe to osdmap when cluster is full
        libceph: handle new osdmap down/state change encoding
        rbd: handle online resize of underlying rbd image
        ceph: avoid inode lookup on nfs fh reconnect
        ceph: use LOOKUPINO to make unconnected nfs fh more reliable
        rbd: use snprintf for disk->disk_name
        rbd: cleanup: make kfree match kmalloc
        rbd: warn on update_snaps failure on notify
        ceph: check return value for start_request in writepages
        ceph: remove useless check
        libceph: add missing breaks in addr_set_port
        libceph: fix TAG_WAIT case
        ceph: fix broken comparison in readdir loop
        libceph: fix osdmap timestamp assignment
        ceph: fix rare potential cap leak
        libceph: use snprintf for unknown addrs
        libceph: use snprintf for formatting object name
        ceph: use snprintf for dirstat content
        libceph: fix uninitialized value when no get_authorizer method is set
        ...
      57bb5595
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 2a651c7f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: update Documentation pointers
        net/9p: enable 9p to work in non-default network namespace
        net/9p: p9_idpool_get return -1 on error
        fs/9p: Don't clunk dentry fid when we fail to get a writeback inode
        9p: Small cleanup in <net/9p/9p.h>
        9p: remove experimental tag from tested configurations
        9p: typo fixes and minor cleanups
        net/9p: Change linuxdoc names to match functions.
      2a651c7f
    • L
      Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block · c88bc60a
      Linus Torvalds 提交于
      * 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block:
        splice: add wakeup_pipe_readers()
      c88bc60a
    • L
      Merge branch 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block · 929cfdd5
      Linus Torvalds 提交于
      * 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block: (110 commits)
        loop: handle on-demand devices correctly
        loop: limit 'max_part' module param to DISK_MAX_PARTS
        drbd: fix warning
        drbd: fix warning
        drbd: Fix spelling
        drbd: fix schedule in atomic
        drbd: Take a more conservative approach when deciding max_bio_size
        drbd: Fixed state transitions after async outdate-peer-handler returned
        drbd: Disallow the peer_disk_state to be D_OUTDATED while connected
        drbd: Fix for the connection problems on high latency links
        drbd: fix potential activity log refcount imbalance in error path
        drbd: Only downgrade the disk state in case of disk failures
        drbd: fix disconnect/reconnect loop, if ping-timeout == ping-int
        drbd: fix potential distributed deadlock
        lru_cache.h: fix comments referring to ts_ instead of lc_
        drbd: Fix for application IO with the on-io-error=pass-on policy
        xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions.
        xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override.
        xen/blkback: don't fail empty barrier requests
        xen/blkback: fix xenbus_transaction_start() hang caused by double xenbus_transaction_end()
        ...
      929cfdd5
    • L
      Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block · 798ce8f1
      Linus Torvalds 提交于
      * 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block: (40 commits)
        cfq-iosched: free cic_index if cfqd allocation fails
        cfq-iosched: remove unused 'group_changed' in cfq_service_tree_add()
        cfq-iosched: reduce bit operations in cfq_choose_req()
        cfq-iosched: algebraic simplification in cfq_prio_to_maxrq()
        blk-cgroup: Initialize ioc->cgroup_changed at ioc creation time
        block: move bd_set_size() above rescan_partitions() in __blkdev_get()
        block: call elv_bio_merged() when merged
        cfq-iosched: Make IO merge related stats per cpu
        cfq-iosched: Fix a memory leak of per cpu stats for root group
        backing-dev: Kill set but not used var in  bdi_debug_stats_show()
        block: get rid of on-stack plugging debug checks
        blk-throttle: Make no throttling rule group processing lockless
        blk-cgroup: Make cgroup stat reset path blkg->lock free for dispatch stats
        blk-cgroup: Make 64bit per cpu stats safe on 32bit arch
        blk-throttle: Make dispatch stats per cpu
        blk-throttle: Free up a group only after one rcu grace period
        blk-throttle: Use helper function to add root throtl group to lists
        blk-throttle: Introduce a helper function to fill in device details
        blk-throttle: Dynamically allocate root group
        blk-cgroup: Allow sleeping while dynamically allocating a group
        ...
      798ce8f1
  2. 25 5月, 2011 29 次提交