1. 21 Jun, 2012 6 commits
  2. 20 Jun, 2012 1 commit
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2012-06-04' of... · 9c19415c
      Dave Airlie authored
      Merge tag 'drm-intel-next-2012-06-04' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
      Daniel Vetter writes:
      rc2 is out the door so I've figured I'll annoy you with the first -next
      pull request for 3.6 already. Highlights:
      - new wait_rendring_timeout interface (Ben)
      - l3 cache remapping and error uevent support (Ben)
      - even more infoframes work from Paulo
      - gen4 hotplug rework from Chris
      - prep work to make Laurent Pincharts original mode constification for
       connector->mode_fixup possible
      QA reported a few new bugs this time around, but no regressions afact. For
      3.5 the only thing I'm aware of is the edp vdd dmesg spam Linus originally
      reported - it looks like that might have been introduced in 3.5. But
      somehow my brain is routinely offline when I work on that issue, so things
      seem to take forever (and atm I'm at patch v4 for that little problem).
      * tag 'drm-intel-next-2012-06-04' of git://people.freedesktop.org/~danvet/drm-intel: (39 commits)
        drm/i915: add min freq control to debugfs
        drm/i915: don't chnage the original mode in dp_mode_fixup
        drm/i915: adjusted_mode->clock in the dp mode_fixup
        drm/i915: compute the target_clock for edp directly
        drm/i915: extract object active state flushing code
        drm/i915: clarify IBX dp workaround
        drm/i915: simplify sysfs setup code
        drm/i915: initialize the parity work only once
        drm/i915: ivybridge_handle_parity_error should be static
        drm/i915: l3 parity sysfs interface
        drm/i915: remap l3 on hw init
        drm/i915: enable parity error interrupts
        drm/i915: Dynamic Parity Detection handling
        drm/i915: s/mdelay/msleep/ in the sdvo detect function
        drm/i915: reuse the sdvo tv clock adjustment in ilk mode_set
        drm/i915: there's no cxsr on ilk
        drm/i915: add some barriers when changing DIPs
        drm/i915: remove comment about HSW HDMI DIPs
        drm/i915: don't set SDVO_BORDER_ENABLE when we're HDMI
        drm/i915: don't write 0 to DIP control at HDMI init
  3. 17 Jun, 2012 2 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · fb09185a
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Radeon is most of the work, one regression, one BUG fix in the new
        prime code, some fixes to init code to make streamout not lock up the
        hardware, and just some code to enable users to test HDMI audio on
        later hw (its off by default).
        Intel adds edp edid caching for some strange Dell Vostros that black
        screen on startup if keep reading their EDID, and a fix for a DP
        Otherwise fix for via/sis and one to stop udl binding to multiple
        non-video usb."
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: cache the EDID for eDP panels
        Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"
        drm/i915: eDP aux needs vdd
        drm/i915: don't enumerate HDMID if an eDP panel is already active on the port
        drm/radeon: add support for STRMOUT_BASE_UPDATE on 7xx
        drm/radeon: add some additional 6xx/7xx/EG register init
        drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
        drm sis: initialize object_idr
        drm via: initialize object_idr
        drm/radeon/prime: reserve/unreserve around pin
        drm/radeon: fix regression in dynpm due to multi-ring rework
        vga_switcheroo.h: fix pci_dev warning
        drm/udl: only bind to the video devices on the hub.
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 41a328b9
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A bit larger set than usual, unfortunately -- I've been sitting on
        them longer than I meant to so it's really more like 2 -rc pull
        requests in one, volume-wise.
        Nearly everything is fixes for fallout from the merge window, or other
        fixes for bugs.  The one exception is the highbank L2-enablement
        patch, but it was contained enough that I picked it up anyway:
         - i.MX fixes, mostly for clock and pinctrl changes
         - OMAP fixes, mostly PM-related
         - A patch to enable L2 on highbank
         - A couple of fixes for PXA, Kirkwood, Versatile"
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
        ARM: Kirkwood: Fix clk problems modular ethernet driver
        arm: versatile: fix and enable PCI I/O space
        ARM: highbank: Add smc calls to enable/disable the L2
        ARM i.MX imx21ads: Fix overlapping static i/o mappings
        ARM: imx6: exit coherency when shutting down a cpu
        ARM: mx51: Add pinctrl_provide_dummies()
        ARM: mx31: Add pinctrl_provide_dummies()
        ARM: OMAP2+: Fix compile for CONFIG_TIDSPBRIDGE platform init code
        ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set
        ARM: OMAP: Fix MMC_OMAP build when only MMC_OMAP_HS is selected
        OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup
        ARM: mmp: fix missing cascade_irq in irq handler
        ARM: dts: update memory size on brownstone
        ARM i.MX27 Visstrim M10: fix gpio handling.
        ARM i.MX53: Fix PLL4 base address
        ARM i.MX pllv2: make round_rate accurate
        ARM i.MX pllv2: use standard register set unconditionally
        ARM: OMAP: Fix lis3lv02d accelerometer to use gpio_to_irq
        ARM: imx: only call l2x0_init if it's available
        ARM: imx: only specify i2c device type once
  4. 16 Jun, 2012 22 commits
  5. 15 Jun, 2012 9 commits
    • Hugh Dickins's avatar
      swap: fix shmem swapping when more than 8 areas · 9b15b817
      Hugh Dickins authored
      Minchan Kim reports that when a system has many swap areas, and tmpfs
      swaps out to the ninth or more, shmem_getpage_gfp()'s attempts to read
      back the page cannot locate it, and the read fails with -ENOMEM.
      Whoops.  Yes, I blindly followed read_swap_header()'s pte_to_swp_entry(
      swp_entry_to_pte()) technique for determining maximum usable swap
      offset, without stopping to realize that that actually depends upon the
      pte swap encoding shifting swap offset to the higher bits and truncating
      it there.  Whereas our radix_tree swap encoding leaves offset in the
      lower bits: it's swap "type" (that is, index of swap area) that was
      Fix it by reducing the SWP_TYPE_SHIFT() in swapops.h, and removing the
      broken radix_to_swp_entry(swp_to_radix_entry()) from read_swap_header().
      This does not reduce the usable size of a swap area any further, it
      leaves it as claimed when making the original commit: no change from 3.0
      on x86_64, nor on i386 without PAE; but 3.0's 512GB is reduced to 128GB
      per swapfile on i386 with PAE.  It's not a change I would have risked
      five years ago, but with x86_64 supported for ten years, I believe it's
      appropriate now.
      Hmm, and what if some architecture implements its swap pte with offset
      encoded below type? That would equally break the maximum usable swap
      offset check.  Happily, they all follow the same tradition of encoding
      offset above type, but I'll prepare a check on that for next.
      Reported-and-Reviewed-and-Tested-by: default avatarMinchan Kim <minchan@kernel.org>
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Cc: stable@vger.kernel.org [3.1, 3.2, 3.3, 3.4]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · a2c2df86
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a couple of minor fixes, one for a preempt warning in the
        mpt2sas driver and one is a config failure with the new sd async
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] Fix sd_probe_domain config problem
        [SCSI] mpt2sas: Fix unsafe using smp_processor_id() in preemptible
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 873b779d
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include:
         - Fix a couple of mount regressions due to the recent cleanups.
         - Fix an Oops in the open recovery code
         - Fix an rpc_pipefs upcall hang that results from some of the net
           namespace work from 3.4.x (stable kernel candidate).
         - Fix a couple of write and o_direct regressions that were found at
           last weeks Bakeathon testing event in Ann Arbor."
      * tag 'nfs-for-3.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS: add an endian notation for sparse
        NFSv4.1: integer overflow in decode_cb_sequence_args()
        rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer
        NFSv4 do not send an empty SETATTR compound
        NFSv2: EOF incorrectly set on short read
        NFS: Use the NFS_DEFAULT_VERSION for v2 and v3 mounts
        NFS: fix directio refcount bug on commit
        NFSv4: Fix unnecessary delegation returns in nfs4_do_open
        NFSv4.1: Convert another trivial printk into a dprintk
        NFS4: Fix open bug when pnfs module blacklisted
        NFS: Remove incorrect BUG_ON in nfs_found_client
        NFS: Map minor mismatch error to protocol not support error.
        NFS: Fix a commit bug
        NFS4: Set parsed mount data version to 4
        NFSv4.1: Ensure we clear session state flags after a session creation
        NFSv4.1: Convert a trivial printk into a dprintk
        NFSv4: Fix up decode_attr_mdsthreshold
        NFSv4: Fix an Oops in the open recovery code
        NFSv4.1: Fix a request leak on the back channel
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 56b880e2
      Linus Torvalds authored
      Pull DMA-mapping fixes from Marek Szyprowski:
       "A set of minor fixes for dma-mapping code (ARM and x86) required for
        Contiguous Memory Allocator (CMA) patches merged in v3.5-rc1."
      * 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        x86: dma-mapping: fix broken allocation when dma_mask has been provided
        ARM: dma-mapping: fix debug messages in dmabounce code
        ARM: mm: fix type of the arm_dma_limit global variable
        ARM: dma-mapping: Add missing static storage class specifier
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 1043e3be
      Linus Torvalds authored
      Pull PowerPC fix from Paul Mackerras:
       "Just one commit, and a one-liner at that, but an important one;
        without it hard_irq_disable() does nothing on powerpc."
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        Make hard_irq_disable() actually hard-disable interrupts
    • Linus Torvalds's avatar
      Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux · 93dd048d
      Linus Torvalds authored
      Pull two nfsd bugfixes from J. Bruce Fields.
      * 'for-3.5' of git://linux-nfs.org/~bfields/linux:
        nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels
        NFS: hard-code init_net for NFS callback transports
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.5-rc2-tag' of... · 069915b9
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      Pull five Xen bug-fixes from Konrad Rzeszutek Wilk:
       - When booting as PVHVM we would try to use PV console - but would not validate
         the parameters causing us to crash during restore b/c we re-use the wrong event
       - When booting on machines with SR-IOV PCI bridge we didn't check for the bridge
         and tried to use it.
       - Under AMD machines would advertise the APERFMPERF resulting in needless amount
         of MSRs from the guest.
       - A global value (xen_released_pages) was not subtracted at bootup when pages
         were added back in. This resulted in the balloon worker having the wrong
         account of how many pages were truly released.
       - Fix dead-lock when xen-blkfront is run in the same domain as xen-blkback.
      * tag 'stable/for-linus-3.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: mark local pages as FOREIGN in the m2p_override
        xen/setup: filter APERFMPERF cpuid feature out
        xen/balloon: Subtract from xen_released_pages the count that is populated.
        xen/pci: Check for PCI bridge before using it.
        xen/events: Add WARN_ON when quick lookup found invalid type.
        xen/hvc: Check HVM_PARAM_CONSOLE_[EVTCHN|PFN] for correctness.
        xen/hvc: Fix error cases around HVM_PARAM_CONSOLE_PFN
        xen/hvc: Collapse error logic.
    • Linus Torvalds's avatar
      Merge tag 'usb-3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 41c8c535
      Linus Torvalds authored
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a bunch of tiny fixes for the USB core and drivers for
        A bunch of gadget fixes, and new device ids, as well as some fixes for
        a number of different regressions that have been reported recently.
        We also fixed some PCI host controllers to resolve a long-standing bug
        with a whole class of host controllers that have been plaguing people
        for a number of kernel releases, preventing their systems from
        suspending properly.
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'usb-3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (41 commits)
        USB: fix gathering of interface associations
        usb: ehci-sh: fix illegal phy_init() running when platform_data is NULL
        usb: cdc-acm: fix devices not unthrottled on open
        Fix OMAP EHCI suspend/resume failure (i693)
        USB: ohci-hub: Mark ohci_finish_controller_resume() as __maybe_unused
        usb: use usb_serial_put in usb_serial_probe errors
        USB: EHCI: Fix build warning in xilinx ehci driver
        USB: fix PS3 EHCI systems
        xHCI: Increase the timeout for controller save/restore state operation
        xhci: Don't free endpoints in xhci_mem_cleanup()
        xhci: Fix invalid loop check in xhci_free_tt_info()
        xhci: Fix error path return value.
        USB: Checking the wrong variable in usb_disable_lpm()
        usb-storage: Add 090c:1000 to unusal-devs
        USB: serial-generic: use a single set of device IDs
        USB: serial: Enforce USB driver and USB serial driver match
        USB: add NO_D3_DURING_SLEEP flag and revert 151b6128
        USB: option: add more YUGA device ids
        USB: mos7840: Fix compilation of usb serial driver
        USB: option: fix memory leak
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 8e53ed10
      Linus Torvalds authored
      Pull IDE fixes from David S. Miller:
      1) Two fixes to icside, one for a build failure and another for a
         warning.  From Christian Dietrich.
      2) Fix a bit operation that did erroneous masking, from Julia Lawall.
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        drivers/ide/ide-cs.c: adjust suspicious bit operation
        ide: icside.c: fix printk format string compile warning
        ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n