07 Jan, 2015

5 commits

  • Pull networking fixes from David Miller:
    "Just a pile of random fixes, including:

    1) Do not apply TSO limits to non-TSO packets, fix from Herbert Xu.

    2) MDI{,X} eeprom check in e100 driver is reversed, from John W.
    Linville.

    3) Missing error return assignments in several ethernet drivers, from
    Julia Lawall.

    4) Altera TSE device doesn't come back up after ifconfig down/up
    sequence, fix from Kostya Belezko.

    5) Add more cases to the check for whether the qmi_wwan device has a
    bogus MAC address and needs to be assigned a random one. From
    Kristian Evensen.

    6) Fix interrupt hangs in CPSW, from Felipe Balbi.

    7) Implement ndo_features_check in r8152 so that the stack doesn't
    feed GSO packets which are outside of the chip's capabilities.
    From Hayes Wang"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
    qla3xxx: don't allow never end busy loop
    xen-netback: fixing the propagation of the transmit shaper timeout
    r8152: support ndo_features_check
    batman-adv: fix potential TT client + orig-node memory leak
    batman-adv: fix multicast counter when purging originators
    batman-adv: fix counter for multicast supporting nodes
    batman-adv: fix lock class for decoding hash in network-coding.c
    batman-adv: fix delayed foreign originator recognition
    batman-adv: fix and simplify condition when bonding should be used
    Revert "mac80211: Fix accounting of the tailroom-needed counter"
    net: ethernet: cpsw: fix hangs with interrupts
    enic: free all rq buffs when allocation fails
    qmi_wwan: Set random MAC on devices with buggy fw
    openvswitch: Consistently include VLAN header in flow and port stats.
    tcp: Do not apply TSO segment limit to non-TSO packets
    Altera TSE: Add missing phydev
    net/mlx4_core: Fix error flow in mlx4_init_hca()
    net/mlx4_core: Correcly update the mtt's offset in the MR re-reg flow
    qlcnic: Fix return value in qlcnic_probe()
    net: axienet: fix error return code
    ...

    Linus Torvalds
     
  • Pull IPMI fixlet from Corey Minyard:
    "Fix a compile warning"

    * tag 'for-linus-3' of git://git.code.sf.net/p/openipmi/linux-ipmi:
    ipmi: Fix compile warning with tv_usec

    Linus Torvalds
     
  • The counter variable wasn't increased at all which may stuck under
    certain circumstances.

    Signed-off-by: Andy Shevchenko
    Signed-off-by: David S. Miller

    Andy Shevchenko
     
  • Since e9ce7cb6b107 ("xen-netback: Factor queue-specific data into queue struct"),
    the transimt shaper timeout is always set to 0. The value the user sets via
    xenbus is never propagated to the transmit shaper.

    This patch fixes the issue.

    Cc: Anthony Liguori
    Signed-off-by: Imre Palik
    Acked-by: Ian Campbell
    Signed-off-by: David S. Miller

    Palik, Imre
     
  • Support ndo_features_check to avoid:
    - the transport offset is more than the hw limitation when using hw checksum.
    - the skb->len of a GSO packet is more than the limitation.

    Signed-off-by: Hayes Wang
    Signed-off-by: David S. Miller

    hayeswang
     

05 Jan, 2015

1 commit

  • The CPSW IP implements pulse-signaled interrupts. Due to
    that we must write a correct, pre-defined value to the
    CPDMA_MACEOIVECTOR register so the controller generates
    a pulse on the correct IRQ line to signal the End Of
    Interrupt.

    The way the driver is written today, all four IRQ lines
    are requested using the same IRQ handler and, because of
    that, we could fall into situations where a TX IRQ fires
    but we tell the controller that we ended an RX IRQ (or
    vice-versa). This situation triggers an IRQ storm on the
    reserved IRQ 127 of INTC which will in turn call ack_bad_irq()
    which will, then, print a ton of:

    unexpected IRQ trap at vector 00

    In order to fix the problem, we are moving all calls to
    cpdma_ctlr_eoi() inside the IRQ handler and making sure
    we *always* write the correct value to the CPDMA_MACEOIVECTOR
    register. Note that the algorithm assumes that IRQ numbers and
    value-to-be-written-to-EOI are proportional, meaning that a
    write of value 0 would trigger an EOI pulse for the RX_THRESHOLD
    Interrupt and that's the IRQ number sitting in the 0-th index
    of our irqs_table array.

    This, however, is safe at least for current implementations of
    CPSW so we will refrain from making the check smarter (and, as
    a side-effect, slower) until we actually have a platform where
    IRQ lines are swapped.

    This patch has been tested for several days with AM335x- and
    AM437x-based platforms. AM57x was left out because there are
    still pending patches to enable ethernet in mainline for that
    platform. A read of the TRM confirms the statement on previous
    paragraph.

    Reported-by: Yegor Yefremov
    Fixes: 510a1e7 (drivers: net: davinci_cpdma: acknowledge interrupt properly)
    Cc: # v3.9+
    Signed-off-by: Felipe Balbi
    Acked-by: Tony Lindgren
    Signed-off-by: David S. Miller

    Felipe Balbi
     

03 Jan, 2015

7 commits

  • When allocation of all RQs fail, we do not free previously allocated buffers,
    before returning error. This causes memory leak.

    This patch fixes this by calling vnic_rq_clean(), which frees all the rq
    buffers.

    Signed-off-by: Govindarajulu Varadarajan
    Signed-off-by: David S. Miller

    Govindarajulu Varadarajan
     
  • Some buggy firmwares export an incorrect MAC address (00:a0:c6:00:00:00). This
    makes for example checking devices for random MAC addresses tricky, and you
    might end up with multiple network interfaces with the same address.

    This patch tries to fix, or at least improve, the situation by setting the MAC
    address of devices with this firmware bug to a random address. I tested the
    patch with two devices that has this firmware bug (Huawei E398 and E392), and
    network traffic worked fine after changing the address.

    Signed-off-by: Kristian Evensen
    Signed-off-by: David S. Miller

    Kristian Evensen
     
  • Pull SCSI fixes from James Bottomley:
    "This is a set of three fixes: one to correct an abort path thinko
    causing failures (and a panic) in USB on device misbehaviour, One to
    fix an out of order issue in the fnic driver and one to match discard
    expectations to qemu which otherwise cause Linux to behave badly as a
    guest"

    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
    SCSI: fix regression in scsi_send_eh_cmnd()
    fnic: IOMMU Fault occurs when IO and abort IO is out of order
    sd: tweak discard heuristics to work around QEMU SCSI issue

    Linus Torvalds
     
  • Altera network device doesn't come up after

    ifconfig eth0 down
    ifconfig eth0 up

    The reason behind is clearing priv->phydev during tse_shutdown().
    The phydev is not restored back at tse_open().

    Resubmiting as to follow Tobias Klauser suggestion.
    phy_start/phy_stop are called on each ifup/ifdown and
    phy_disconnect is called once during the module removal.

    Signed-off-by: Kostya Belezko
    Signed-off-by: David S. Miller

    Kostya Belezko
     
  • We shouldn't call UNMAP_FA here, this is done in mlx4_load_one.

    If mlx4_query_func fails, we need to invoke CLOSE_HCA for both
    native and master.

    Fixes: a0eacca948d2 ('net/mlx4_core: Refactor mlx4_load_one')
    Signed-off-by: Jack Morgenstein
    Signed-off-by: Or Gerlitz
    Signed-off-by: David S. Miller

    Jack Morgenstein
     
  • Previously, mlx4_mt_rereg_write filled the MPT's entity_size with the
    old MTT's page shift, which could result in using an incorrect offset.
    Fix the initialization to be after we calculate the new MTT offset.

    In addition, assign mtt order to -1 after calling mlx4_mtt_cleanup. This
    is necessary in order to mark the MTT as invalid and avoid freeing it later.

    Fixes: e630664 ('mlx4_core: Add helper functions to support MR re-registration')
    Signed-off-by: Maor Gottlieb
    Signed-off-by: Matan Barak
    Signed-off-by: Or Gerlitz
    Signed-off-by: David S. Miller

    Maor Gottlieb
     
  • Pull vhost cleanup and virtio bugfix
    "There's a single change here, fixing a vhost bug where vhost
    initialization fails due to used ring alignment check being too
    strict"

    * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
    vhost: relax used address alignment
    virtio_ring: document alignment requirements

    Linus Torvalds
     

01 Jan, 2015

9 commits

  • If the check of adapter fails and goes into the 'else' branch, the
    return value 'err' should not still be zero.

    Signed-off-by: Yongjian Xu
    Acked-by: Shahed Shaikh
    Signed-off-by: David S. Miller

    Yongjian Xu
     
  • Return a negative error code on failure.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @@
    identifier ret; expression e1,e2;
    @@
    (
    if (\(ret < 0\|ret != 0\))
    { ... return ret; }
    |
    ret = 0
    )
    ... when != ret = e1
    when != &ret
    *if(...)
    {
    ... when != ret = e2
    when forall
    return ret;
    }
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     
  • Return a negative error code on failure.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @@
    identifier ret; expression e1,e2;
    @@
    (
    if (\(ret < 0\|ret != 0\))
    { ... return ret; }
    |
    ret = 0
    )
    ... when != ret = e1
    when != &ret
    *if(...)
    {
    ... when != ret = e2
    when forall
    return ret;
    }
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     
  • Return a negative error code on failure.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @@
    identifier ret; expression e1,e2;
    @@
    (
    if (\(ret < 0\|ret != 0\))
    { ... return ret; }
    |
    ret = 0
    )
    ... when != ret = e1
    when != &ret
    *if(...)
    {
    ... when != ret = e2
    when forall
    return ret;
    }
    //

    The patch also modifies the test of mgp->cmd to satisfy checkpatch.

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     
  • Return a negative error code on failure.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @@
    identifier ret; expression e1,e2;
    @@
    (
    if (\(ret < 0\|ret != 0\))
    { ... return ret; }
    |
    ret = 0
    )
    ... when != ret = e1
    when != &ret
    *if(...)
    {
    ... when != ret = e2
    when forall
    return ret;
    }
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     
  • I didn't notice that return in the code, fix it by
    adding a goto out instead to free the memory.

    Fixes:

    > New smatch warnings:
    > drivers/net/ethernet/intel/i40e/i40e_debugfs.c:832 i40e_dbg_dump_desc() warn: possible memory leak of 'ring'

    Reported-by: Dan Carpenter
    Signed-off-by: Joe Perches
    Tested-by: Jim Young
    Signed-off-by: Jeff Kirsher

    Joe Perches
     
  • This reverts commit 9d469d033d135d80742a4e39e6bbb4519dd5eee1.

    It breaks the Chromebook Pixel touchpad (and touchscreen).

    Reported-by: Dirk Hohndel
    Bisected-by: Linus Torvalds
    Cc: Nick Dyer
    Cc: Benson Leung
    Cc: Yufeng Shen
    Cc: Dmitry Torokhov
    Cc: stable@vger.kernel.org # v3.16+
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Remove a FIXME comment that was missed in a commit on 1/2007.

    Signed-off-by: Todd Fujinaka
    Reported-by: nick
    Tested-by: Aaron Brown
    Signed-off-by: Jeff Kirsher

    Todd Fujinaka
     
  • Although it doesn't explicitly say so, commit 60ffa478759f39a2 ("e100:
    Fix MDIO/MDIO-X") appears to be intended to revert the earlier commit
    648951451e6d2d53 ("e100: fixed e100 MDI/MDI-X issues"). However,
    careful examination reveals that the attempted revert actually
    _inverted_ the test for eeprom_mdix_enabled. That is bound to program
    a few PHYs incorrectly...

    https://bugzilla.redhat.com/show_bug.cgi?id=1156417

    Signed-off-by: "John W. Linville"
    Tested-by: Aaron Brown
    Signed-off-by: Jeff Kirsher

    John W. Linville
     

31 Dec, 2014

6 commits

  • Pull ARM SoC fixes from Arnd Bergmann:
    "A very small set of fixes for 3.19, as everyone was out.

    The clocksource patch was something I missed for the merge window
    after the change that broke arm64 was merged through arm-soc. The
    other two patches are a fix for an undetected merge problem in mvebu
    and a defconfig change to make some exynos boards work with the normal
    multi_v7_defconfig"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    Add USB_EHCI_EXYNOS to multi_v7_defconfig
    ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
    clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64

    Linus Torvalds
     
  • Pull fbdev fixes from Tomi Valkeinen:

    - Fix regression with Nokia N900 display

    - Fix crash on fbdev using freed __initdata logos

    - Fix fb_deferred_io_fsync() return value.

    * tag 'fbdev-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
    OMAPDSS: SDI: fix output port_num
    video/fbdev: fix defio's fsync
    video/logo: prevent use of logos after they have been freed
    OMAPDSS: pll: NULL dereference in error handling
    OMAPDSS: HDMI: remove double initializer entries

    Linus Torvalds
     
  • Pull input layer fixes from Dmitry Torokhov:
    "Fixes for v7 protocol for ALPS devices and few other driver fixes.

    Also users can request input events to be stamped with boot time
    timestamps, in addition to real and monotonic timestamps"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: hil_kbd - fix incorrect use of init_completion
    Input: alps - v7: document the v7 touchpad packet protocol
    Input: alps - v7: fix finger counting for > 2 fingers on clickpads
    Input: alps - v7: sometimes a single touch is reported in mt[1]
    Input: alps - v7: ignore new packets
    Input: evdev - add CLOCK_BOOTTIME support
    Input: psmouse - expose drift duration for IBM trackpoints
    Input: stmpe - bias keypad columns properly
    Input: stmpe - enforce device tree only mode
    mfd: stmpe: add pull up/down register offsets for STMPE
    Input: optimize events_per_packet count calculation
    Input: edt-ft5x06 - fixed a macro coding style issue
    Input: gpio_keys - replace timer and workqueue with delayed workqueue
    Input: gpio_keys - allow separating gpio and irq in device tree

    Linus Torvalds
     
  • It's not a long int on all arches.

    Signed-off-by: Corey Minyard

    Corey Minyard
     
  • Pull networking fixes from David Miller:

    1) Fix double SKB free in bluetooth 6lowpan layer, from Jukka Rissanen.

    2) Fix receive checksum handling in enic driver, from Govindarajulu
    Varadarajan.

    3) Fix NAPI poll list corruption in virtio_net and caif_virtio, from
    Herbert Xu. Also, add code to detect drivers that have this mistake
    in the future.

    4) Fix doorbell endianness handling in mlx4 driver, from Amir Vadai.

    5) Don't clobber IP6CB() before xfrm6_policy_check() is called in TCP
    input path,f rom Nicolas Dichtel.

    6) Fix MPLS action validation in openvswitch, from Pravin B Shelar.

    7) Fix double SKB free in vxlan driver, also from Pravin.

    8) When we scrub a packet, which happens when we are switching the
    context of the packet (namespace, etc.), we should reset the
    secmark. From Thomas Graf.

    9) ->ndo_gso_check() needs to do more than return true/false, it also
    has to allow the driver to clear netdev feature bits in order for
    the caller to be able to proceed properly. From Jesse Gross.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
    genetlink: A genl_bind() to an out-of-range multicast group should not WARN().
    netlink/genetlink: pass network namespace to bind/unbind
    ne2k-pci: Add pci_disable_device in error handling
    bonding: change error message to debug message in __bond_release_one()
    genetlink: pass multicast bind/unbind to families
    netlink: call unbind when releasing socket
    netlink: update listeners directly when removing socket
    genetlink: pass only network namespace to genl_has_listeners()
    netlink: rename netlink_unbind() to netlink_undo_bind()
    net: Generalize ndo_gso_check to ndo_features_check
    net: incorrect use of init_completion fixup
    neigh: remove next ptr from struct neigh_table
    net: xilinx: Remove unnecessary temac_property in the driver
    net: phy: micrel: use generic config_init for KSZ8021/KSZ8031
    net/core: Handle csum for CHECKSUM_COMPLETE VXLAN forwarding
    openvswitch: fix odd_ptr_err.cocci warnings
    Bluetooth: Fix accepting connections when not using mgmt
    Bluetooth: Fix controller configuration with HCI_QUIRK_INVALID_BDADDR
    brcmfmac: Do not crash if platform data is not populated
    ipw2200: select CFG80211_WEXT
    ...

    Linus Torvalds
     
  • Commit ac61d1955934 (scsi: set correct completion code in
    scsi_send_eh_cmnd()) introduced a bug. It changed the stored return
    value from a queuecommand call, but it didn't take into account that
    the return value was used again later on. This patch fixes the bug by
    changing the later usage.

    There is a big comment in the middle of scsi_send_eh_cmnd() which
    does a good job of explaining how the routine works. But it mentions
    a "rtn = FAILURE" value that doesn't exist in the code. This patch
    adjusts the code to match the comment (I assume the comment is right
    and the code is wrong).

    This fixes Bugzilla #88341.

    Signed-off-by: Alan Stern
    Reported-by: Андрей Аладьев
    Tested-by: Андрей Аладьев
    Fixes: ac61d19559349e205dad7b5122b281419aa74a82
    Acked-by: Hannes Reinecke
    Cc:
    Signed-off-by: James Bottomley

    Alan Stern
     

30 Dec, 2014

12 commits

  • Pull "Fixes for 3.19" from Andrew Lunn:

    Jason is taking a back seat this cycle and i'm doing all the patch
    wrangling for mvebu.

    * tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu:
    ARM: mvebu: Fix pinctrl configuration for Armada 370 DB

    Also update to Linux 3.19-rc1, which this was based on.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • When I/O is aborted by mid-layer, fnic FW will complete the I/O before
    completing the abort task. In some cases abort request is completed before
    the I/O, which could lead to inconsistent driver and firmware states.
    In this case firmware reset would clear the inconsistent state.

    Signed-off-by: Anil Chintalapati
    Signed-off-by: Sesidhar Baddela
    Signed-off-by: Hiral Shah
    Signed-off-by: Christoph Hellwig

    Anil Chintalapati (achintal)
     
  • 7985090aa020 changed the discard heuristics to give preference to the
    WRITE SAME commands that (unlike UNMAP) guarantee deterministic results.

    Ming Lei discovered that QEMU SCSI's WRITE SAME implementation
    internally relied on limits that were only communicated for the UNMAP
    case. And therefore discard commands backed by WRITE SAME would fail.

    Tweak the heuristics so we still pick UNMAP in the LBPRZ=0 case and only
    prefer the WRITE SAME variants if the device has the LBPRZ flag set.

    Reported-by: Ming Lei
    Tested-by: Ming Lei
    Signed-off-by: Martin K. Petersen
    Acked-by: Paolo Bonzini
    Signed-off-by: Christoph Hellwig

    Martin K. Petersen
     
  • After the commit ef691ff48bc8 (OMAPDSS: DT: Get source endpoint by
    matching reg-id) we look for the SDI output using the port number.
    However, the SDI driver doesn't set the port number, which causes the
    SDI display to not initialize.

    Fix this by setting the SDI port number to 1. We use a hardcoded value,
    as SDI was used only on OMAP3 and it's always port number 1 there.

    Reported-by: Aaro Koskinen
    Reported-by: Pavel Machek
    Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     
  • fb_deferred_io_fsync() returns the value of schedule_delayed_work() as
    an error code, but schedule_delayed_work() does not return an error. It
    returns true/false depending on whether the work was already queued.

    Fix this by ignoring the return value of schedule_delayed_work().

    Signed-off-by: Tomi Valkeinen
    Cc: stable@vger.kernel.org

    Tomi Valkeinen
     
  • Pull power management and ACPI material from Rafael J Wysocki:
    "These are fixes (operating performance points library, cpufreq-dt
    driver, cpufreq core, ACPI backlight, cpupower tool), cleanups
    (cpuidle), new processor IDs for the RAPL (Running Average Power
    Limit) power capping driver, and a modification of the generic power
    domains framework allowing modular drivers to call one of its helper
    functions.

    Specifics:

    - Fix for a potential NULL pointer dereference in the cpufreq core
    due to an initialization race condition (Ethan Zhao).

    - Fixes for abuse of the OPP (Operating Performance Points) API
    related to RCU and other minor issues in the OPP library and the
    cpufreq-dt driver (Dmitry Torokhov).

    - cpuidle governors cleanup making them measure idle duration in a
    better way without using the CPUIDLE_FLAG_TIME_INVALID flag which
    allows that flag to be dropped from the ACPI cpuidle driver and
    from the core too (Len Brown).

    - New ACPI backlight blacklist entries for Samsung machines without a
    working native backlight interface that need to use the ACPI
    backlight instead (Aaron Lu).

    - New CPU IDs of future Intel Xeon CPUs for the Intel RAPL power
    capping driver (Jacob Pan).

    - Generic power domains framework modification to export the
    of_genpd_get_from_provider() function to modular drivers that will
    allow future driver modifications to be based on the mainline (Amit
    Daniel Kachhap).

    - Two fixes for the cpupower tool (Michal Privoznik, Prarit
    Bhargava)"

    * tag 'pm+acpi-3.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    ACPI / video: Add some Samsung models to disable_native_backlight list
    tools / cpupower: Fix no idle state information return value
    tools / cpupower: Correctly detect if running as root
    cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
    cpufreq-dt: defer probing if OPP table is not ready
    PM / OPP: take RCU lock in dev_pm_opp_get_opp_count
    PM / OPP: fix warning in of_free_opp_table()
    PM / OPP: add some lockdep annotations
    powercap / RAPL: add IDs for future Xeon CPUs
    PM / Domains: Export of_genpd_get_from_provider function
    cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
    cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
    cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID

    Linus Torvalds
     
  • Pull spi fixes from Mark Brown:
    "A few driver specific fixes here, the DMA burst size increase in the
    spfi driver is a fix to make the hardware happier in some situations"

    * tag 'spi-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
    spi: img-spfi: Increase DMA burst size
    spi: img-spfi: Enable controller before starting TX DMA
    spi: sh-msiof: Add runtime PM lock in initializing

    Linus Torvalds
     
  • Pull one regulator fix from Mark Brown:
    "One fix here, a fix for the voltage mapping on one of the s2mps11
    regulators which broke systems using it including apparently the
    Gear 2 smartwatches"

    * tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
    regulator: s2mps11: Fix dw_mmc failure on Gear 2

    Linus Torvalds
     
  • Pull one MMC fix from Ulf Hansson:
    "MMC core:

    - Fix selection of buswidth for mmc hosts supporting 1-bit only"

    * tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc:
    mmc: core: stop trying to switch width when only one bit is supported

    Linus Torvalds
     
  • Pull thermal management updates from Zhang Rui:
    "First of all, the most important change is the thermal cpu cooling
    fixes. The major fix here is to have proper sequencing between
    cpufreq layer and thermal cpu cooling registration. A take away of
    this fix is an improvement in the thermal drivers code. Thermal
    drivers that require cpu cooling do not need to check for cpufreq
    layer. The requirement now is to propagate the error code, if any,
    while registering cpu cooling device. Thanks to Viresh for
    implementing the required CPUfreq changes.

    Second, a new driver is introduced for int340x processor thermal
    device. Given that int340x thermal is disabled by default, and this
    processor thermal device is only available on limited platforms, plus
    the driver does nothing but exposes some thermal limitation
    information for user space to use, thus I think it is safe to include
    it in this pull request after missing 3.19-rc2.

    Specifics:

    - Thermal cpu cooling fixes and cleanups.

    - introduce INT340X processor thermal reporting device driver.

    - several small fixes and cleanups for int340x thermal drivers"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (43 commits)
    Thermal/int340x/int3403: Free acpi notification handler
    Thermal/int340x/processor_thermal: Fix memory leak
    Thermal/int340x/int3403: Fix memory leak
    thermal: int340x: Introduce processor reporting device
    thermal: int340x_thermal: drop owner assignment from platform_drivers
    thermal: drop owner assignment from platform_drivers
    thermal: cpu_cooling: document node in struct cpufreq_cooling_device
    thermal/powerclamp: add ids for future xeon cpus
    Thermal/int340x: Handle properly the case when _trt or _art acpi entry is missing
    thermal: cpu_cooling: return ERR_PTR() for !CPU_THERMAL or !THERMAL_OF
    thermal: cpu_cooling: small memory leak on error
    thermal: ti-soc-thermal: Do not print error message in the EPROBE_DEFER case
    thermal: db8500: Do not print error message in the EPROBE_DEFER case
    thermal: imx: Do not print error message in the EPROBE_DEFER case
    thermal: Fix cdev registration with THERMAL_NO_LIMIT on 64bit
    drivers: thermal: Remove ARCH_HAS_BANDGAP dependency for samsung
    thermal:core:fix: Check return code of the ->get_max_state() callback
    thermal: cpu_cooling: update copyright tags
    thermal: cpu_cooling: Use cpufreq_dev->freq_table for finding level/freq
    thermal: cpu_cooling: Store frequencies in descending order
    ...

    Linus Torvalds
     
  • * acpi-video:
    ACPI / video: Add some Samsung models to disable_native_backlight list

    Rafael J. Wysocki
     
  • * pm-domains:
    PM / Domains: Export of_genpd_get_from_provider function

    * powercap:
    powercap / RAPL: add IDs for future Xeon CPUs

    * pm-tools:
    tools / cpupower: Fix no idle state information return value
    tools / cpupower: Correctly detect if running as root

    Rafael J. Wysocki