1. 25 6月, 2012 2 次提交
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a4a20fd9
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Nothing very controversial in here.  Most of the fixes are for OMAP
        this time around, with some orion/kirkwood and a tegra patch mixed in."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: Orion: Fix Virtual/Physical mixup with watchdog
        ARM: Kirkwood: clk_register_gate_fn: add fn assignment
        ARM: Orion5x - Restore parts of io.h, with rework
        ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
        ARM: OMAP2+: mux: fix sparse warning
        ARM: OMAP2+: CM: increase the module disable timeout
        ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
        ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
        ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
        ARM: OMAP: Fix Beagleboard DVI reset gpio
        arm/dts: OMAP2: Fix interrupt controller binding
        ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0
        ARM: OMAP2+: Fix MUSB ifdefs for platform init code
        ARM: tegra: make tegra_cpu_reset_handler_enable() __init
        ARM: OMAP: PM: Lock clocks list while generating summary
        ARM: iconnect: Remove include of removed linux/spi/orion_spi.h
      a4a20fd9
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 2ecedc47
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing major in here, one radeon SI fix for tiling, and one uninit
        var fix, two minor header file fixes."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: drop comment about this header being autogenerated.
        drm/edid: don't return stack garbage from supports_rb
        vga_switcheroo: Add include guard
        drm/radeon: SI tiling fixes for display
      2ecedc47
  2. 24 6月, 2012 5 次提交
  3. 23 6月, 2012 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 002b758b
      Linus Torvalds 提交于
      Pull Ceph fixes from Sage Weil:
       "There are a couple of fixes from Yan for bad pointer dereferences in
        the messenger code and when fiddling with page->private after page
        migration, a fix from Alex for a use-after-free in the osd client
        code, and a couple fixes for the message refcounting and shutdown
        ordering."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: flush msgr queue during mon_client shutdown
        rbd: Clear ceph_msg->bio_iter for retransmitted message
        libceph: use con get/put ops from osd_client
        libceph: osd_client: don't drop reply reference too early
        ceph: check PG_Private flag before accessing page->private
      002b758b
    • L
      Merge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs · 369c4f54
      Linus Torvalds 提交于
      Pull XFS fixes from Ben Myers:
       - Fix stale data exposure with unwritten extents
       - Fix a warning in xfs_alloc_vextent with ODEBUG
       - Fix overallocation and alignment of pages for xfs_bufs
       - Fix a cursor leak
       - Fix a log hang
       - Fix a crash related to xfs_sync_worker
       - Rename xfs log structure from struct log to struct xlog so we can use
         crash dumps effectively
      
      * tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs:
        xfs: rename log structure to xlog
        xfs: shutdown xfs_sync_worker before the log
        xfs: Fix overallocation in xfs_buf_allocate_memory()
        xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near
        xfs: check for stale inode before acquiring iflock on push
        xfs: fix debug_object WARN at xfs_alloc_vextent()
        xfs: xfs_vm_writepage clear iomap_valid when !buffer_uptodate (REV2)
      369c4f54
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a1163719
      Linus Torvalds 提交于
      Pull perf updates from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ftrace: Make all inline tags also include notrace
        perf: Use css_tryget() to avoid propping up css refcount
        perf tools: Fix synthesizing tracepoint names from the perf.data headers
        perf stat: Fix default output file
        perf tools: Fix endianity swapping for adds_features bitmask
      a1163719
  4. 22 6月, 2012 15 次提交
  5. 21 6月, 2012 15 次提交
    • J
      Btrfs: delay iput with async extents · cb77fcd8
      Josef Bacik 提交于
      There is some concern that these iput()'s could be the final iputs and could
      induce lockups on people waiting on writeback.  This would happen in the
      rare case that we don't create ordered extents because of an error, but it
      is theoretically possible and we already have a mechanism to deal with this
      so just make them delayed iputs to negate any worry.
      Signed-off-by: NJosef Bacik <josef@redhat.com>
      Signed-off-by: NChris Mason <chris.mason@fusionio.com>
      cb77fcd8
    • J
      Btrfs: add a missing spin_lock · e18fca73
      Josef Bacik 提交于
      When fixing up the locking in the delayed ref destruction work I accidently
      broke the locking myself ;(.  Add back a spin_lock that should be there and
      we are now all set.  Thanks,
      Btrfs: add a missing spin_lock
      
      When fixing up the locking in the delayed ref destruction work I accidently
      broke the locking myself ;(.  Add back a spin_lock that should be there and
      we are now all set.  Thanks,
      Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NJosef Bacik <josef@redhat.com>
      Signed-off-by: NChris Mason <chris.mason@fusionio.com>
      e18fca73
    • A
      Btrfs: don't assume to be on the correct extent in add_all_parents · 69bca40d
      Alexander Block 提交于
      add_all_parents did assume that path is already at a correct extent data
      item, which may not be true in case of data extents that were partly
      rewritten and splitted.
      
      We need to check if we're on a matching extent for every item and only
      for the ones after the first. The loop is changed to do this now.
      
      This patch also fixes a bug introduced with commit 3b127fd8 "Btrfs:
      remove obsolete btrfs_next_leaf call from __resolve_indirect_ref".
      The removal of next_leaf did sometimes result in slot==nritems when
      the above described case happens, and thus resulting in invalid values
      (e.g. wanted_obejctid) in add_all_parents (leading to missed backrefs
      or even crashes).
      Signed-off-by: NAlexander Block <ablock84@googlemail.com>
      Signed-off-by: NJan Schmidt <list.btrfs@jan-o-sch.net>
      Signed-off-by: NChris Mason <chris.mason@fusionio.com>
      69bca40d
    • A
      Btrfs: introduce btrfs_next_old_item · 1c8f52a5
      Alexander Block 提交于
      We introduce btrfs_next_old_item that uses btrfs_next_old_leaf instead
      of btrfs_next_leaf.
      
      btrfs_next_item is also changed to simply call btrfs_next_old_item with
      time_seq being 0.
      Signed-off-by: NAlexander Block <ablock84@googlemail.com>
      Signed-off-by: NChris Mason <chris.mason@fusionio.com>
      1c8f52a5
    • D
      drm/edid: don't return stack garbage from supports_rb · b196a498
      Daniel Vetter 提交于
      We need to initialize this to false, because the is_rb callback only
      ever sets it to true.
      
      Noticed while reading through the code.
      
      Cc: stable@vger.kernel.org
      Signed-Off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: NAdam Jackson <ajax@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      b196a498
    • O
      vga_switcheroo: Add include guard · d3decf3a
      Ozan Çağlayan 提交于
      Guard vga_switcheroo.h against multiple inclusion.
      Signed-off-by: NOzan Çağlayan <ozancag@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      d3decf3a
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 7940b2ad
      Linus Torvalds 提交于
      Pull slave-dmaengine fixes from Vinod Koul:
       "A few fixes in pl330 and imx-sdma drivers."
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        DMA: PL330: Fix racy mutex unlock
        DMA: PL330: Add missing static storage class specifier
        dma: imx-sdma: buf_tail should be initialize in prepare function
        dmaengine: pl330: dont complete descriptor for cyclic dma
      7940b2ad
    • L
      Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 2ce56829
      Linus Torvalds 提交于
      Pull two cgroup fixes from Tejun Heo:
       "This containes two patches fixing a refcnt race bug during css_put().
        Decrementing and checking the value weren't atomic and two tasks could
        think that they both pushed the counter to zero."
      
      * 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroups: Account for CSS_DEACT_BIAS in __css_put
        cgroup: make sure that decisions in __css_put are atomic
      2ce56829
    • D
      mm, mempolicy: fix mbind() to do synchronous migration · c4c0e9e5
      David Rientjes 提交于
      If the range passed to mbind() is not allocated on nodes set in the
      nodemask, it migrates the pages to respect the constraint.
      
      The final formal of migrate_pages() is a mode of type enum migrate_mode,
      not a boolean.  do_mbind() is currently passing "true" which is the
      equivalent of MIGRATE_SYNC_LIGHT.  This should instead be MIGRATE_SYNC
      for synchronous page migration.
      Signed-off-by: NDavid Rientjes <rientjes@google.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c4c0e9e5
    • R
      media: pms.c needs linux/slab.h · 0e3534c0
      Randy Dunlap 提交于
      drivers/media/video/pms.c uses kzalloc() and kfree() so it should
      include <linux/slab.h> to fix build errors and a warning.
      
        drivers/media/video/pms.c:1047:2: error: implicit declaration of function 'kzalloc'
        drivers/media/video/pms.c:1047:6: warning: assignment makes pointer from integer without a cast
        drivers/media/video/pms.c:1116:2: error: implicit declaration of function 'kfree'
      
      Found in mmotm but applies to mainline.
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Cc: Hans Verkuil <hverkuil@xs4all.nl>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0e3534c0
    • L
      Merge tag 'staging-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · bc259adc
      Linus Torvalds 提交于
      Pull staging tree fixes from Greg Kroah-Hartman:
       "Here are a number of small fixes for the drivers/staging tree, as well
        as iio and pstore drivers (which came from the staging tree in the
        3.5-rc1 merge).  All of these are tiny, but resolve issues that people
        have been reporting.
      
        There's also a documentation update to reflect what the iio drivers
        really are doing, which is good to get straightened out.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'staging-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: r8712u: Add new USB IDs
        staging: gdm72xx: Release netlink socket properly
        iio: drop wrong reference from Kconfig
        pstore/inode: Make pstore_fill_super() static
        pstore/ram: Should zap persistent zone on unlink
        pstore/ram_core: Factor persistent_ram_zap() out of post_init()
        pstore/ram_core: Do not reset restored zone's position and size
        pstore/ram: Should update old dmesg buffer before reading
        staging:iio:ad7298: Fix linker error due to missing IIO kfifo buffer
        Revert "staging: usbip: bugfix for stack corruption on 64-bit architectures"
        staging: usbip: bugfix for stack corruption on 64-bit architectures
        staging/comedi: fix build for USB not enabled
        staging: omapdrm: fix crash when freeing bad fb
        staging:iio:ad7606: Re-add missing scale attribute
        iio: Fix potential use after free
        staging:iio: remove num_interrupt_lines from documentation
        iio: documentation: Add out_altvoltage and friends
      bc259adc
    • L
      Merge tag 'driver-core-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · fe803524
      Linus Torvalds 提交于
      Pull driver core and printk fixes from Greg Kroah-Hartman:
       "Here are some fixes for 3.5-rc4 that resolve the kmsg problems that
        people have reported showing up after the printk and kmsg changes went
        into 3.5-rc1.  There are also a smattering of other tiny fixes for the
        extcon and hyper-v drivers that people have reported.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        extcon: max8997: Add missing kfree for info->edev in max8997_muic_remove()
        extcon: Set platform drvdata in gpio_extcon_probe() and fix irq leak
        extcon: Fix wrong index in max8997_extcon_cable[]
        kmsg - kmsg_dump() fix CONFIG_PRINTK=n compilation
        printk: return -EINVAL if the message len is bigger than the buf size
        printk: use mutex lock to stop syslog_seq from going wild
        kmsg - kmsg_dump() use iterator to receive log buffer content
        vme: change maintainer e-mail address
        Extcon: Don't try to create duplicate link names
        driver core: fixup reversed deferred probe order
        printk: Fix alignment of buf causing crash on ARM EABI
        Tools: hv: verify origin of netlink connector message
      fe803524
    • L
      Merge tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · f8fc0c9a
      Linus Torvalds 提交于
      Pull misc tree updates from Greg Kroah-Hartman:
       "Here are some drivers/misc bugfixes (really just drivers/misc/mei/
        fixes) for a few problems that have been reported.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        misc: mei: set WDIOF_ALARMONLY on mei watchdog
        misc: mei: Disable MSI when IRQ registration fails
        misc: mei: fix stalled read
        misc: mei: unregister misc device in pci_remove function
        misc: mei: set IRQF_ONESHOT for msi request_threaded_irq
      f8fc0c9a
    • L
      Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · a1821f77
      Linus Torvalds 提交于
      Pull serial driver fixes from Greg Kroah-Hartman:
       "Here are 3 patches resolving a boot regression (the mop500 fix), a
        build warning fix, and a kernel-doc fix.  All tiny, but should go into
        the final 3.5 release.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial/amba-pl011: move custom pin control to driver
        serial: fix serial_txx9.c build warning/typo
        serial: fix kernel-doc warnings in 8250.c
      a1821f77
    • L
      Merge branch 'akpm' (Andrew's patch-bomb) · a2a2609c
      Linus Torvalds 提交于
      * emailed from Andrew Morton <akpm@linux-foundation.org>: (21 patches)
        mm/memblock: fix overlapping allocation when doubling reserved array
        c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place
        pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper
        pidns: guarantee that the pidns init will be the last pidns process reaped
        fault-inject: avoid call to random32() if fault injection is disabled
        Viresh has moved
        get_maintainer: Fix --help warning
        mm/memory.c: fix kernel-doc warnings
        mm: fix kernel-doc warnings
        mm: correctly synchronize rss-counters at exit/exec
        mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range
        h8300: use the declarations provided by <asm/sections.h>
        h8300: fix use of extinct _sbss and _ebss
        xtensa: use the declarations provided by <asm/sections.h>
        xtensa: use "test -e" instead of bashism "test -a"
        xtensa: replace xtensa-specific _f{data,text} by _s{data,text}
        memcg: fix use_hierarchy css_is_ancestor oops regression
        mm, oom: fix and cleanup oom score calculations
        nilfs2: ensure proper cache clearing for gc-inodes
        thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE
        ...
      a2a2609c