1. 24 Jun, 2012 2 commits
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a4a20fd9
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 2ecedc47
      Linus Torvalds authored
      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. 23 Jun, 2012 6 commits
  3. 22 Jun, 2012 9 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs · 369c4f54
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a1163719
      Linus Torvalds authored
      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
    • Dave Airlie's avatar
      drm: drop comment about this header being autogenerated. · 59bbe27b
      Dave Airlie authored
      This comment is well out of date.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      59bbe27b
    • Ricardo Neri's avatar
      ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled · dc57aef5
      Ricardo Neri authored
      As per the OMAP4 documentation, audio over HDMI must be transmitted in
      no-idle mode. This patch adds the HWMOD_SWSUP_SIDLE so that omap_hwmod uses
      no-idle/force-idle settings instead of smart-idle mode.
      
      This is required as the DSS interface clock is used as functional clock
      for the HDMI wrapper audio FIFO. If no-idle mode is not used, audio could
      be choppy, have bad quality or not be audible at all.
      Signed-off-by: default avatarRicardo Neri <ricardo.neri@ti.com>
      [b-cousson@ti.com: Update the subject and align the .flags
      location with the script template]
      Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      dc57aef5
    • Paul Walmsley's avatar
      ARM: OMAP2+: mux: fix sparse warning · 65e25976
      Paul Walmsley authored
      Commit bbd707ac ("ARM: omap2: use
      machine specific hook for late init") resulted in the addition of this
      sparse warning:
      
      arch/arm/mach-omap2/mux.c:791:12: warning: symbol 'omap_mux_late_init' was not declared. Should it be static?
      
      Fix by including the header file containing the prototype.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Cc: Tony Lindgren <tony@atomide.com>
      65e25976
    • Paul Walmsley's avatar
      ARM: OMAP2+: CM: increase the module disable timeout · b8f15b7e
      Paul Walmsley authored
      Increase the timeout for disabling an IP block to five milliseconds.
      This is to handle the usb_host_fs idle latency, which takes almost
      four milliseconds after a host controller reset.
      
      This is the second of two patches needed to resolve the following
      boot warning:
      
      omap_hwmod: usb_host_fs: _wait_target_disable failed
      
      Thanks to Sergei Shtylyov <sshtylyov@mvista.com> for finding
      an unrelated hunk in a previous version of this patch.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Sergei Shtylyov <sshtylyov@mvista.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      b8f15b7e
    • Paul Walmsley's avatar
      ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks · 9a47d32d
      Paul Walmsley authored
      Until the OMAP4 code is converted to disable the use of the clock
      framework-based clockdomain enable/disable sequence, any clock used as
      a hwmod main_clk must have a clockdomain associated with it.  This
      patch populates some clock structure clockdomain names to resolve the
      following warnings during kernel init:
      
      omap_hwmod: dpll_mpu_m2_ck: missing clockdomain for dpll_mpu_m2_ck.
      omap_hwmod: trace_clk_div_ck: missing clockdomain for trace_clk_div_ck.
      omap_hwmod: l3_div_ck: missing clockdomain for l3_div_ck.
      omap_hwmod: ddrphy_ck: missing clockdomain for ddrphy_ck.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Rajendra Nayak <rnayak@ti.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      9a47d32d
    • Paul Walmsley's avatar
      ARM: OMAP4: hwmod data: fix 32k sync timer idle modes · 252a4c54
      Paul Walmsley authored
      The 32k sync timer IP block target idle modes in the hwmod data are
      incorrect.  The IP block does not support any smart-idle modes.
      Update the data to reflect the correct modes.
      
      This problem was initially identified and a diff fragment posted to
      the lists by Benoît Cousson <b-cousson@ti.com>.  A patch description
      bug in the first version was also identified by Benoît.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      252a4c54
    • Djamil Elaidi's avatar
      ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby · 561038f0
      Djamil Elaidi authored
      If an IP is configured in Smart-Standby-Wakeup, when disabling wakeup feature the
      IP will not go back to Smart-Standby, but will remain in Smart-Standby-Wakeup.
      Signed-off-by: default avatarDjamil Elaidi <d-elaidi@ti.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      561038f0
  4. 21 Jun, 2012 18 commits
  5. 20 Jun, 2012 5 commits
    • Linus Torvalds's avatar
      Merge tag 'staging-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · bc259adc
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · fe803524
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · f8fc0c9a
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · a1821f77
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Andrew's patch-bomb) · a2a2609c
      Linus Torvalds authored
      * 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