20 Nov, 2012

7 commits

  • With the new registration functions, governors can be now
    registered with devfreq framework.

    NOTE: generates 'discards qualifiers from pointer target type'
    build warnings, which the next patche in this series fixes

    Cc: Rajagopal Venkat
    Cc: MyungJoo Ham
    Cc: Kyungmin Park
    Cc: "Rafael J. Wysocki"
    Cc: Kevin Hilman
    Cc: linux-pm@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org

    Signed-off-by: Nishanth Menon
    Acked-by: MyungJoo Ham
    Signed-off-by: MyungJoo Ham

    Nishanth Menon
     
  • Add devfreq_add_governor and devfreq_remove_governor which
    can be invoked by governors to register with devfreq.

    This sets up the stage to dynamically switch governors and
    allow governors to be dynamically loaded as well.

    Cc: Rajagopal Venkat
    Cc: MyungJoo Ham
    Cc: Kyungmin Park
    Cc: "Rafael J. Wysocki"
    Cc: Kevin Hilman
    Cc: linux-pm@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org

    Signed-off-by: Nishanth Menon
    Acked-by: MyungJoo Ham

    Nishanth Menon
     
  • Allow update_devfreq to be used by devfreq governor built
    as modules

    Cc: Rajagopal Venkat
    Cc: MyungJoo Ham
    Cc: Kyungmin Park
    Cc: "Rafael J. Wysocki"
    Cc: Kevin Hilman
    Cc: linux-pm@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org

    Signed-off-by: Nishanth Menon
    Acked-by: MyungJoo Ham
    Signed-off-by: MyungJoo Ham

    Nishanth Menon
     
  • This patch adds sysfs node which can be used to get information of frequency
    transition. It represents transition table which contains total number of transition of
    each freqeuncy state and time spent. It is inspired CPUFREQ's status driver.

    Signed-off-by: Jonghwa Lee
    [Added Documentation/ABI entry, updated kernel-doc, and resolved merge conflict]
    Signed-off-by: MyungJoo Ham

    Jonghwa Lee
     
  • devfreq governors such as ondemand are controlled by a min and
    max frequency, while governors like userspace governor allow us
    to set a specific frequency.
    However, for the same specific device, depending on the SoC, the
    available frequencies can vary.

    So expose the available frequencies as a snapshot over sysfs to
    allow informed decisions.

    This was inspired by cpufreq framework's equivalent for similar
    usage sysfs node: scaling_available_frequencies.

    Cc: Rajagopal Venkat
    Cc: MyungJoo Ham
    Cc: Kyungmin Park
    Cc: "Rafael J. Wysocki"
    Cc: Kevin Hilman
    Cc: linux-pm@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org

    Signed-off-by: Nishanth Menon
    Signed-off-by: MyungJoo Ham

    Nishanth Menon
     
  • struct parameters need to have ':' in documentation for
    scripts/kernel-doc to parse appropriately.

    Fix the errors reported by:
    ./scripts/kernel-doc include/linux/devfreq.h >/dev/null

    Cc: Rajagopal Venkat
    Cc: MyungJoo Ham
    Cc: Kyungmin Park
    Cc: "Rafael J. Wysocki"
    Cc: Kevin Hilman
    Cc: linux-pm@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org

    Signed-off-by: Nishanth Menon
    Acked-by: Randy Dunlap
    Acked-by: MyungJoo Ham
    Signed-off-by: MyungJoo Ham

    Nishanth Menon
     
  • devm_* functions are device managed functions and make cleanup code
    simpler and smaller.
    devm_kzalloc and devm_regulator_get functions are used.

    Signed-off-by: Sachin Kamat
    [renamed the patch title by MyungJoo Ham]
    Signed-off-by: MyungJoo Ham

    Sachin Kamat
     

15 Nov, 2012

6 commits

  • devfreq_class is used internally by devfreq and has no
    need to be globally available.

    This also fixes the following sparse warning:
    drivers/devfreq/devfreq.c:30:14: warning: symbol 'devfreq_class' was not declared. Should it be static?

    Signed-off-by: Nishanth Menon
    Signed-off-by: Rafael J. Wysocki

    Nishanth Menon
     
  • sscanf returns 0 when an invalid parameter like:
    echo -n "a">min_freq
    is attempted. Returning back the return result(0) will
    cause the command not to return back to command
    prompt.

    Instead, just return -EINVAL when sscanf does not
    return 1.

    This is done for min_freq, max_freq and polling_interval

    Signed-off-by: Nishanth Menon
    Acked-by: MyungJoo Ham
    Signed-off-by: Rafael J. Wysocki

    Nishanth Menon
     
  • Parameter documentation needs a ':' for scripts/kernel-doc
    to parse properly.

    Minor fixes for ones warned by:
    ./scripts/kernel-doc -text drivers/devfreq/devfreq.c>/dev/null

    Signed-off-by: Nishanth Menon
    Acked-by: Randy Dunlap
    Acked-by: MyungJoo Ham
    Signed-off-by: Rafael J. Wysocki

    Nishanth Menon
     
  • Devfreq returns governor predicted frequency as current frequency
    via sysfs interface. But device may not support all frequencies
    that governor predicts. So add a callback in device profile to get
    current freq from driver. Also add a new sysfs node to expose
    governor predicted next target frequency.

    Signed-off-by: Rajagopal Venkat
    Acked-by: MyungJoo Ham
    Signed-off-by: Rafael J. Wysocki

    Rajagopal Venkat
     
  • Add devfreq suspend/resume apis for devfreq users. This patch
    supports suspend and resume of devfreq load monitoring, required
    for devices which can idle.

    Signed-off-by: Rajagopal Venkat
    Acked-by: MyungJoo Ham
    Signed-off-by: Rafael J. Wysocki

    Rajagopal Venkat
     
  • Prepare devfreq core framework to support devices which
    can idle. When device idleness is detected perhaps through
    runtime-pm, need some mechanism to suspend devfreq load
    monitoring and resume back when device is online. Present
    code continues monitoring unless device is removed from
    devfreq core.

    This patch introduces following design changes,

    - use per device work instead of global work to monitor device
    load. This enables suspend/resume of device devfreq and
    reduces monitoring code complexity.
    - decouple delayed work based load monitoring logic from core
    by introducing helpers functions to be used by governors. This
    provides flexibility for governors either to use delayed work
    based monitoring functions or to implement their own mechanism.
    - devfreq core interacts with governors via events to perform
    specific actions. These events include start/stop devfreq.
    This sets ground for adding suspend/resume events.

    The devfreq apis are not modified and are kept intact.

    Signed-off-by: Rajagopal Venkat
    Acked-by: MyungJoo Ham
    Signed-off-by: Rafael J. Wysocki

    Rajagopal Venkat
     

11 Nov, 2012

3 commits

  • Linus Torvalds
     
  • Pull networking fixes from David Miller:
    "Bug fixes galore, mostly in drivers as is often the case:

    1) USB gadget and cdc_eem drivers need adjustments to their frame size
    lengths in order to handle VLANs correctly. From Ian Coolidge.

    2) TIPC and several network drivers erroneously call tasklet_disable
    before tasklet_kill, fix from Xiaotian Feng.

    3) r8169 driver needs to apply the WOL suspend quirk to more chipsets,
    fix from Cyril Brulebois.

    4) Fix multicast filters on RTL_GIGA_MAC_VER_35 r8169 chips, from
    Nathan Walp.

    5) FDB netlink dumps should use RTM_NEWNEIGH as the message type, not
    zero. From John Fastabend.

    6) Fix smsc95xx tx checksum offload on big-endian, from Steve
    Glendinning.

    7) __inet_diag_dump() needs to repsect and report the error value
    returned from inet_diag_lock_handler() rather than ignore it.
    Otherwise if an inet diag handler is not available for a particular
    protocol, we essentially report success instead of giving an error
    indication. Fix from Cyrill Gorcunov.

    8) When the QFQ packet scheduler sees TSO/GSO packets it does not
    handle things properly, and in fact ends up corrupting it's
    datastructures as well as mis-schedule packets. Fix from Paolo
    Valente.

    9) Fix oopser in skb_loop_sk(), from Eric Leblond.

    10) CXGB4 passes partially uninitialized datastructures in to FW
    commands, fix from Vipul Pandya.

    11) When we send unsolicited ipv6 neighbour advertisements, we should
    send them to the link-local allnodes multicast address, as per
    RFC4861. Fix from Hannes Frederic Sowa.

    12) There is some kind of bug in the usbnet's kevent deferral
    mechanism, but more immediately when it triggers an uncontrolled
    stream of kernel messages spam the log. Rate limit the error log
    message triggered when this problem occurs, as sending thousands
    of error messages into the kernel log doesn't help matters at all,
    and in fact makes further diagnosis more difficult.

    From Steve Glendinning.

    13) Fix gianfar restore from hibernation, from Wang Dongsheng.

    14) The netlink message attribute sizes are wrong in the ipv6 GRE
    driver, it was using the size of ipv4 addresses instead of ipv6
    ones :-) Fix from Nicolas Dichtel."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    gre6: fix rtnl dump messages
    gianfar: ethernet vanishes after restoring from hibernation
    usbnet: ratelimit kevent may have been dropped warnings
    ipv6: send unsolicited neighbour advertisements to all-nodes
    net: usb: cdc_eem: Fix rx skb allocation for 802.1Q VLANs
    usb: gadget: g_ether: fix frame size check for 802.1Q
    cxgb4: Fix initialization of SGE_CONTROL register
    isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES
    cxgb4: Initialize data structures before using.
    af-packet: fix oops when socket is not present
    pkt_sched: enable QFQ to support TSO/GSO
    net: inet_diag -- Return error code if protocol handler is missed
    net: bnx2x: Fix typo in bnx2x driver
    smsc95xx: fix tx checksum offload for big endian
    rtnetlink: Use nlmsg type RTM_NEWNEIGH from dflt fdb dump
    ptp: update adjfreq callback description
    r8169: allow multicast packets on sub-8168f chipset.
    r8169: Fix WoL on RTL8168d/8111d.
    drivers/net: use tasklet_kill in device remove/close process
    tipc: do not use tasklet_disable before tasklet_kill

    Linus Torvalds
     
  • Pull sparc fixes from David Miller:
    "Several build/bug fixes for sparc, including:

    1) Configuring a mix of static vs. modular sparc64 crypto modules
    didn't work, remove an ill-conceived attempt to only have to build
    the device match table for these drivers once to fix the problem.

    Reported by Meelis Roos.

    2) Make the montgomery multiple/square and mpmul instructions actually
    usable in 32-bit tasks. Essentially this involves providing 32-bit
    userspace with a way to use a 64-bit stack when it needs to.

    3) Our sparc64 atomic backoffs don't yield cpu strands properly on
    Niagara chips. Use pause instruction when available to achieve
    this, otherwise use a benign instruction we know blocks the strand
    for some time.

    4) Wire up kcmp

    5) Fix the build of various drivers by removing the unnecessary
    blocking of OF_GPIO when SPARC.

    6) Fix unintended regression wherein of_address_to_resource stopped
    being provided. Fix from Andreas Larsson.

    7) Fix NULL dereference in leon_handle_ext_irq(), also from Andreas
    Larsson."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    sparc64: Fix build with mix of modular vs. non-modular crypto drivers.
    sparc: Support atomic64_dec_if_positive properly.
    of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again
    sparc32, leon: Check for existent irq_map entry in leon_handle_ext_irq
    sparc: Add sparc support for platform_get_irq()
    sparc: Allow OF_GPIO on sparc.
    qlogicpti: Fix build warning.
    sparc: Wire up sys_kcmp.
    sparc64: Improvde documentation and readability of atomic backoff code.
    sparc64: Use pause instruction when available.
    sparc64: Fix cpu strand yielding.
    sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.

    Linus Torvalds
     

10 Nov, 2012

17 commits

  • Pull cifs fixes from Jeff Layton.

    * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
    cifs: Do not lookup hashed negative dentry in cifs_atomic_open
    cifs: fix potential buffer overrun in cifs.idmap handling code

    Linus Torvalds
     
  • Pull arm64 fixes from Catalin Marinas:
    - correct argument type (pgprot_t) when calling __ioremap()
    - PCI_IOBASE virtual address change
    - use architected event for CPU cycle counter
    - fix ELF core dumping
    - select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
    - missing completion for secondary CPU boot
    - booting on systems with all memory beyond 4GB

    * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
    arm64: mm: fix booting on systems with no memory below 4GB
    arm64: smp: add missing completion for secondary boot
    arm64: compat: select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
    arm64: elf: fix core dumping definitions for GP and FP registers
    arm64: perf: use architected event for CPU cycle counter
    arm64: Move PCI_IOBASE closer to MODULES_VADDR
    arm64: Use pgprot_t as the last argument when invoking __ioremap()

    Linus Torvalds
     
  • Pull Xen fixes from Konrad Rzeszutek Wilk:
    "There are three ARM compile fixes (we forgot to export certain
    functions and if the drivers are built as an module - we go belly-up).

    There is also an mismatch of irq_enter() / exit_idle() calls sequence
    which were fixed some time ago in other piece of codes, but failed to
    appear in the Xen code.

    Lastly a fix for to help in the field with troubleshooting in case we
    cannot get the appropriate parameter and also fallback code when
    working with very old hypervisors."

    Bug-fixes:
    - Fix compile issues on ARM.
    - Fix hypercall fallback code for old hypervisors.
    - Print out which HVM parameter failed if it fails.
    - Fix idle notifier call after irq_enter.

    * tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/arm: Fix compile errors when drivers are compiled as modules (export more).
    xen/arm: Fix compile errors when drivers are compiled as modules.
    xen/generic: Disable fallback build on ARM.
    xen/events: fix RCU warning, or Call idle notifier after irq_enter()
    xen/hvm: If we fail to fetch an HVM parameter print out which flag it is.
    xen/hypercall: fix hypercall fallback code for very old hypervisors

    Linus Torvalds
     
  • We tried linking in a single built object to hold the device table,
    but only works if all of the sparc64 crypto modules get built the same
    way (modular vs. non-modular).

    Just include the device ID stub into each driver source file so that
    the table gets compiled into the correct result in all cases.

    Reported-by: Meelis Roos
    Signed-off-by: David S. Miller

    David S. Miller
     
  • Sparc32 already supported it, as a consequence of using the
    generic atomic64 implementation. And the sparc64 implementation
    is rather trivial.

    This allows us to set ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE for all
    of sparc, and avoid the annoying warning from lib/atomic64_test.c

    Signed-off-by: David S. Miller

    David S. Miller
     
  • This bug-fix makes sure that of_address_to_resource is defined extern for sparc
    so that the sparc-specific implementation of of_address_to_resource() is once
    again used when including include/linux/of_address.h in a sparc context. A
    number of drivers in mainline relies on this function working for sparc.

    The bug was introduced in a850a7554442f08d3e910c6eeb4ee216868dda1e, "of/address:
    add empty static inlines for !CONFIG_OF". Contrary to that commit title, the
    static inlines are added for !CONFIG_OF_ADDRESS, and CONFIG_OF_ADDRESS is never
    defined for sparc. This is good behavior for the other functions in
    include/linux/of_address.h, as the extern functions defined in
    drivers/of/address.c only gets linked when OF_ADDRESS is configured. However,
    for of_address_to_resource there exists a sparc-specific implementation in
    arch/sparc/arch/sparc/kernel/of_device_common.c

    Solution suggested by: Sam Ravnborg

    Signed-off-by: Andreas Larsson
    Acked-by: Rob Herring
    Signed-off-by: David S. Miller

    Andreas Larsson
     
  • If an irq is being unlinked concurrently with leon_handle_ext_irq,
    irq_map[eirq] might be null in leon_handle_ext_irq. Make sure that
    this is not dereferenced.

    Signed-off-by: Andreas Larsson
    Acked-by: Sam Ravnborg
    Signed-off-by: David S. Miller

    Andreas Larsson
     
  • This adds sparc support for platform_get_irq that in the normal case use
    platform_get_resource() to get an irq. This standard approach fails for sparc as
    there are no resources of type IORESOURCE_IRQ for irqs for sparc.

    Cross platform drivers can then use this standard platform function and work on
    sparc instead of having to have a special case for sparc.

    Signed-off-by: Andreas Larsson
    Signed-off-by: David S. Miller

    Andreas Larsson
     
  • Spotted after a code review.
    Introduced by c12b395a46646bab69089ce7016ac78177f6001f (gre: Support GRE over
    IPv6).

    Signed-off-by: Nicolas Dichtel
    Acked-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Nicolas Dichtel
     
  • If a gianfar ethernet device is down prior to hibernating a
    system, it will no longer be present upon system restore.

    For example:

    ~# ifconfig eth0 down
    ~# echo disk > /sys/power/state

    ~# ifconfig eth0 up
    SIOCSIFFLAGS: No such device

    This happens because the restore function bails out early upon
    finding devices that were not up at hibernation. In doing so,
    it never gets to the netif_device_attach call at the end of
    the restore function. Adding the netif_device_attach as done
    here also makes the gfar_restore code consistent with what is
    done in the gfar_resume code.

    Cc: Claudiu Manoil
    Signed-off-by: Wang Dongsheng
    Signed-off-by: Paul Gortmaker
    Acked-by: Claudiu Manoil
    Signed-off-by: David S. Miller

    Wang Dongsheng
     
  • when something goes wrong, a flood of these messages can be
    generated by usbnet (thousands per second). This doesn't
    generally *help* the condition so this patch ratelimits the
    rate of their generation.

    There's an underlying problem in usbnet's kevent deferral
    mechanism which needs fixing, specifically that events *can*
    get dropped and not handled. This patch doesn't address this,
    but just mitigates fallout caused by the current implemention.

    Signed-off-by: Steve Glendinning
    Signed-off-by: David S. Miller

    Steve Glendinning
     
  • As documented in RFC4861 (Neighbor Discovery for IP version 6) 7.2.6.,
    unsolicited neighbour advertisements should be sent to the all-nodes
    multicast address.

    Signed-off-by: Hannes Frederic Sowa
    Signed-off-by: David S. Miller

    Hannes Frederic Sowa
     
  • Pull drm fixes (again) from Dave Airlie:
    "dropped the ball on a vmware patch, so two more fixes for vmwgfx are
    here, one for hibernate issue, one for a BUG trigger."

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
    drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
    drm/vmwgfx: Fix hibernation device reset

    Linus Torvalds
     
  • Pull PCI fixes from Bjorn Helgaas:
    "Power management:
    - PCI/PM: Fix proc config reg access for D3cold and bridge
    suspending
    - PCI/PM: Resume device before shutdown
    - PCI/PM: Fix deadlock when unbinding device if parent in D3cold
    Hotplug:
    - PCI/portdrv: Don't create hotplug slots unless port supports
    hotplug"

    * tag '3.7-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    PCI/portdrv: Don't create hotplug slots unless port supports hotplug
    PCI/PM: Fix proc config reg access for D3cold and bridge suspending
    PCI/PM: Resume device before shutdown
    PCI/PM: Fix deadlock when unbinding device if parent in D3cold

    Linus Torvalds
     
  • Pull MMC fixes from Chris Ball:
    - sdhci: fix a NULL dereference at resume-time, seen on OLPC XO-4
    - sdhci: fix against 3.7-rc1 for UHS modes without a vqmmc regulator
    - sdhci-of-esdhc: disable CMD23 on boards where it's broken
    - sdhci-s3c: fix against 3.7-rc1 for card detection with runtime PM
    - dw_mmc, omap_hsmmc: fix potential NULL derefs, compiler warnings

    * tag 'mmc-fixes-for-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
    mmc: sdhci-s3c: fix the card detection in runtime-pm
    mmc: sdhci-s3c: use clk_prepare_enable and clk_disable_unprepare
    mmc: dw_mmc: constify dw_mci_idmac_ops in exynos back-end
    mmc: dw_mmc: fix modular build for exynos back-end
    mmc: sdhci: fix NULL dereference in sdhci_request() tuning
    mmc: sdhci: fix IS_ERR() checking of regulator_get()
    mmc: fix sdhci-dove probe/removal
    mmc: sh_mmcif: fix use after free
    mmc: sdhci-pci: fix 'Invalid iomem size' error message condition
    mmc: mxcmmc: Fix MODULE_ALIAS
    mmc: omap_hsmmc: fix NULL pointer dereference for dt boot
    mmc: omap_hsmmc: fix host reference after mmc_free_host
    mmc: dw_mmc: fix multiple drv_data NULL dereferences
    mmc: dw_mmc: enable controller interrupt before calling mmc_start_host
    mmc: sdhci-of-esdhc: disable CMD23 for some Freescale SoCs
    mmc: dw_mmc: remove _dev_info compile warning
    mmc: dw_mmc: convert the variable type of irq

    Linus Torvalds
     
  • Pull crypto fix from Herbert Xu:
    "This push fixes a potential panic in cryptd which may occur with
    crypto drivers such as aesni-intel."

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
    crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption

    Linus Torvalds
     
  • Pull sound fixes from Takashi Iwai:
    "Most of commits are for stable and regression fixes. Except for one
    fix for a regression in 3.7-rc4, there are all driver local changes,
    so nothing too much to worry."

    * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: Fix card refcount unbalance
    ALSA: hda - Add new codec ALC668 and ALC900 (default name ALC1150)
    ALSA: hda - Improve HP depop when system enter to S3
    ALSA: usb-audio: Fix crash at re-preparing the PCM stream
    ALSA: hdspm - Fix sync check reporting on RME RayDAT
    ALSA: hda - Add pin fixups for ASUS G75
    ALSA: hda - Fix invalid connections in VT1802 codec
    ALSA: hda - Fix empty DAC filling in patch_via.c
    ALSA: hda - Force to reset IEC958 status bits for AD codecs
    ALSA: es1968: Add ESS vendor ID to pm_whitelist
    ALSA: HDA: Mark CS260x immutable structures const
    ALSA: HDA: Fix digital microphone on CS420x
    ALSA: hda: Cirrus: Fix coefficient index for beep configuration
    ALSA: hda - support Teradici 2200 host card audio
    ALSA: Fix typo in drivers sound

    Linus Torvalds
     

09 Nov, 2012

7 commits

  • The commit 911dec0db4de6ccc544178a8ddaf9cec0a11d533
    "xen/arm: Fix compile errors when drivers are compiled as modules." exports
    the neccessary functions. But to guard ourselves against out-of-tree modules
    and future drivers hitting this, lets export all of the relevant
    hypercalls.

    Acked-by: Arnd Bergmann
    Signed-off-by: Stefano Stabellini
    Signed-off-by: Konrad Rzeszutek Wilk

    Stefano Stabellini
     
  • Signed-off-by: Thomas Hellstrom
    Reviewed-by: Brian Paul
    Reviewed-by: Dmitry Torokhov
    Cc: stable@vger.kernel.org
    Cc: linux-graphics-maintainer@vmware.com
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • The device would not reset properly when resuming from hibernation.

    Signed-off-by: Thomas Hellstrom
    Reviewed-by: Brian Paul
    Reviewed-by: Dmitry Torokhov
    Cc: stable@vger.kernel.org
    Cc: linux-graphics-maintainer@vmware.com
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • …t/linusw/linux-pinctrl

    Pull pinctrl fixes from Linus Walleij:

    - A set of SPEAr pinctrl fixes that recently arrived

    - A fixup for the Samsung/Exynos Kconfig deps

    * tag 'pinctrl-for-v3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
    pinctrl: samsung and exynos need to depend on OF && GPIOLIB
    pinctrl: SPEAr1340: Add clcd sleep mode pin configuration
    pinctrl: SPEAr1340: Make DDR reset & clock pads as gpio
    pinctrl: SPEAr1310: add register entries for enabling pad direction
    pinctrl: SPEAr1310: Separate out pci pins from pcie_sata pin group
    pinctrl: SPEAr1310: Fix value of PERIP_CFG reigster and MCIF_SEL_SHIFT
    pinctrl: SPEAr1310: fix clcd high resolution pin group name
    pinctrl: SPEAr320: Correct pad mux entries for rmii/smii
    pinctrl: SPEAr3xx: correct register space to configure pwm
    pinctrl: SPEAr: Don't update all non muxreg bits on pinctrl_disable

    Linus Torvalds
     
  • Pull s390 fixes from Martin Schwidefsky:
    "A couple of bug fixes. I keep the fingers crossed that we now got
    transparent huge pages ready for prime time."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/cio: fix length calculation in idset.c
    s390/sclp: fix addressing mode clobber
    s390: Move css limits from drivers/s390/cio/ to include/asm/.
    s390/thp: respect page protection in pmd_none() and pmd_present()
    s390/mm: use pmd_large() instead of pmd_huge()
    s390/cio: suppress 2nd path verification during resume

    Linus Torvalds
     
  • Pull HID fix from Jiri Kosina:
    "This reverts a patch that causes regression in binding between HID
    devices and drivers during device unplug/replug cycle."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
    HID: hidraw: put old deallocation mechanism in place

    Linus Torvalds
     
  • Merge misc fixes from Andrew Morton:
    "Five fixes"

    * emailed patches from Andrew Morton : (5 patches)
    h8300: add missing L1_CACHE_SHIFT
    mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
    fanotify: fix missing break
    revert "epoll: support for disabling items, and a self-test app"
    checkpatch: improve network block comment style checking

    Linus Torvalds