Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update my fork with torvalds #4

Merged
merged 70 commits into from
Nov 12, 2014
Merged

Update my fork with torvalds #4

merged 70 commits into from
Nov 12, 2014

Commits on Oct 28, 2014

  1. usb: dwc2: gadget: fix enumeration issues

    Excessive debug messages might cause timing issues that prevent correct
    usb enumeration. This patch hides information about USB bus reset to let
    driver enumerate fast enough to avoid making host angry. This fixes
    endless enumeration and usb reset loop observed with some Linux hosts.
    
    Acked-by: Paul Zimmerman <paulz@synopsys.com>
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Reviewed-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Felipe Balbi <balbi@ti.com>
    mszyprow authored and Felipe Balbi committed Oct 28, 2014
    Configuration menu
    Copy the full SHA
    9599815 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2014

  1. arm64: psci: fix cpu_suspend to check idle state type for index

    This fix rectifies the psci cpu_suspend implementation to check the
    PSCI power state parameter type field associated with the requested idle
    state index.
    
    Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Amit Daniel Kachhap authored and wildea01 committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    f4fd36b View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2014

  1. USB: kobil_sct: fix non-atomic allocation in write path

    Write may be called from interrupt context so make sure to use
    GFP_ATOMIC for all allocations in write.
    
    Fixes: 1da177e ("Linux-2.6.12-rc2")
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    jhovold committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    1912528 View commit details
    Browse the repository at this point in the history
  2. USB: opticon: fix non-atomic allocation in write path

    Write may be called from interrupt context so make sure to use
    GFP_ATOMIC for all allocations in write.
    
    Fixes: 0d930e5 ("USB: opticon: Add Opticon OPN2001 write support")
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    jhovold committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    e681286 View commit details
    Browse the repository at this point in the history
  3. USB: cdc-acm: add device id for GW Instek AFG-2225

    Add device-id entry for GW Instek AFG-2225, which has a byte swapped
    bInterfaceSubClass (0x20).
    
    Reported-by: Karl Palsson <karlp@tweak.net.au>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jhovold authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    cf84a69 View commit details
    Browse the repository at this point in the history
  4. cdc-acm: ensure that termios get set when the port is activated

    The driver wasn't properly configuring the hardware for the current
    termios settings under all conditions.  Ensure that termios are
    written to the device when the port is activated.
    
    Signed-off-by: Jim Paris <jim@jtan.com>
    Reviewed-by: Johan Hovold <johan@kernel.org>
    Acked-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jimparis authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    24cb450 View commit details
    Browse the repository at this point in the history
  5. usb: Do not allow usb_alloc_streams on unconfigured devices

    This commit fixes the following oops:
    
    [10238.622067] scsi host3: uas_eh_bus_reset_handler start
    [10240.766164] usb 3-4: reset SuperSpeed USB device number 3 using xhci_hcd
    [10245.779365] usb 3-4: device descriptor read/8, error -110
    [10245.883331] usb 3-4: reset SuperSpeed USB device number 3 using xhci_hcd
    [10250.897603] usb 3-4: device descriptor read/8, error -110
    [10251.058200] BUG: unable to handle kernel NULL pointer dereference at  0000000000000040
    [10251.058244] IP: [<ffffffff815ac6e1>] xhci_check_streams_endpoint+0x91/0x140
    <snip>
    [10251.059473] Call Trace:
    [10251.059487]  [<ffffffff815aca6c>] xhci_calculate_streams_and_bitmask+0xbc/0x130
    [10251.059520]  [<ffffffff815aeb5f>] xhci_alloc_streams+0x10f/0x5a0
    [10251.059548]  [<ffffffff810a4685>] ? check_preempt_curr+0x75/0xa0
    [10251.059575]  [<ffffffff810a46dc>] ? ttwu_do_wakeup+0x2c/0x100
    [10251.059601]  [<ffffffff810a49e6>] ? ttwu_do_activate.constprop.111+0x66/0x70
    [10251.059635]  [<ffffffff815779ab>] usb_alloc_streams+0xab/0xf0
    [10251.059662]  [<ffffffffc0616b48>] uas_configure_endpoints+0x128/0x150 [uas]
    [10251.059694]  [<ffffffffc0616bac>] uas_post_reset+0x3c/0xb0 [uas]
    [10251.059722]  [<ffffffff815727d9>] usb_reset_device+0x1b9/0x2a0
    [10251.059749]  [<ffffffffc0616f42>] uas_eh_bus_reset_handler+0xb2/0x190 [uas]
    [10251.059781]  [<ffffffff81514293>] scsi_try_bus_reset+0x53/0x110
    [10251.059808]  [<ffffffff815163b7>] scsi_eh_bus_reset+0xf7/0x270
    <snip>
    
    The problem is the following call sequence (simplified):
    
    1) usb_reset_device
    2)  usb_reset_and_verify_device
    2)   hub_port_init
    3)    hub_port_finish_reset
    3)     xhci_discover_or_reset_device
            This frees xhci->devs[slot_id]->eps[ep_index].ring for all eps but 0
    4)    usb_get_device_descriptor
           This fails
    5)   hub_port_init fails
    6)  usb_reset_and_verify_device fails, does not restore device config
    7)  uas_post_reset
    8)   xhci_alloc_streams
          NULL deref on the free-ed ring
    
    This commit fixes this by not allowing usb_alloc_streams to continue if
    the device is not configured.
    
    Note that we do allow usb_free_streams to continue after a (logical)
    disconnect, as it is necessary to explicitly free the streams at the xhci
    controller level.
    
    Cc: stable@vger.kernel.org
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jwrdegoede authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    90a646c View commit details
    Browse the repository at this point in the history
  6. usb-storage: handle a skipped data phase

    Sometimes mass-storage devices using the Bulk-only transport will
    mistakenly skip the data phase of a command.  Rather than sending the
    data expected by the host or sending a zero-length packet, they go
    directly to the status phase and send the CSW.
    
    This causes problems for usb-storage, for obvious reasons.  The driver
    will interpret the CSW as a short data transfer and will wait to
    receive a CSW.  The device won't have anything left to send, so the
    command eventually times out.
    
    The SCSI layer doesn't retry commands after they time out (this is a
    relatively recent change).  Therefore we should do our best to detect
    a skipped data phase and handle it promptly.
    
    This patch adds code to do that.  If usb-storage receives a short
    13-byte data transfer from the device, and if the first four bytes of
    the data match the CSW signature, the driver will set the residue to
    the full transfer length and interpret the data as a CSW.
    
    This fixes Bugzilla #86611.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
    Tested-by: Paul Osmialowski <newchief@king.net.pl>
    CC: <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    AlanStern authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    93c9bf4 View commit details
    Browse the repository at this point in the history
  7. uas: Add US_FL_NO_ATA_1X quirk for 1 more Seagate model

    These drives hang when receiving ATA12 commands, so set the US_FL_NO_ATA_1X
    quirk to filter these out.
    
    Cc: stable@vger.kernel.org # 3.16
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jwrdegoede authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    aee0ce3 View commit details
    Browse the repository at this point in the history
  8. USB: HWA: fix a warning message

    We wanted to print the version as (major).(minor) but because the shift
    operation is higher precedence than the mask then we print
    (minor).(minor).
    
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Dan Carpenter authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    cee2448 View commit details
    Browse the repository at this point in the history
  9. xhci: Disable streams on Asmedia 1042 xhci controllers

    Streams seem to be broken on the Asmedia 1042. An uas capable Seagate disk
    which is known to work fine with other controllers causes the system to freeze
    when connected over usb-3 with this controller, where as it works fine with
    uas in usb-2 ports, indicating a problem with streams.
    
    This is a bit bigger hammer then I would like to use for this, but for now it
    will have to make do. I've ordered a pci-e usb controller card with an Asmedia
    1042, once that arrives I'll try to get streams to work (with a quirk flag if
    necessary) and then we can re-enable them. For now this at least makes uas
    capable disk enclosures work again by forcing fallback to the usb-storage
    driver.
    
    Reported-by: Bogdan Mihalcea <bogdan.mihalcea@infim.ro>
    Cc: Bogdan Mihalcea <bogdan.mihalcea@infim.ro>
    Cc: stable@vger.kernel.org # 3.16
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jwrdegoede authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    2391eac View commit details
    Browse the repository at this point in the history
  10. uas: Add NO_ATA_1X for VIA VL711 devices

    Just like some Seagate enclosures, these devices do not seem to grok ata
    pass through commands.
    
    Cc: stable@vger.kernel.org # 3.16
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jwrdegoede authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    673029f View commit details
    Browse the repository at this point in the history
  11. usb: Remove references to non-existent PLAT_S5P symbol

    The PLAT_S5P Kconfig symbol was removed in commit d78c16c
    ("ARM: SAMSUNG: Remove remaining legacy code"). There are still
    some references left, fix that by replacing them with ARCH_S5PV210.
    
    Fixes: d78c16c ("ARM: SAMSUNG: Remove remaining legacy code")
    Reported-by: Paul Bolle <pebolle@tiscali.nl>
    Acked-by: Jingoo Han <jg1.han@samsung.com>
    Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Sylwester Nawrocki authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    cd6e245 View commit details
    Browse the repository at this point in the history
  12. usb: storage: fix build warnings !CONFIG_PM

    Functions fw5895_init() and config_autodelink_before_power_down() are used
    only when CONFIG_PM is defined.
    
    drivers/usb/storage/realtek_cr.c:699:13: warning: 'fw5895_init' defined but not used [-Wunused-function]
    drivers/usb/storage/realtek_cr.c:629:12: warning: 'config_autodelink_before_power_down' defined but not used [-Wunused-function]
    
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Luis Henriques authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    ec5633b View commit details
    Browse the repository at this point in the history
  13. MAINTAINERS: Remove duplicate entry for usbip driver

    The usbip driver was moved out of staging in 3.17-rc3 but the MAINTAINERS file
    still has the old staging entry as well as the new one. Remove the old entry.
    
    Signed-off-by: Mark Einon <mark.einon@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    einonm authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    2e06923 View commit details
    Browse the repository at this point in the history
  14. USB: quirks: enable device-qualifier quirk for another Elan touchscreen

    Currently this quirk is enabled for the model with the device id 0x0089, it
    is needed for the 0x009b model, which is found on the Fujitsu Lifebook u904
    as well.
    
    Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Adel Gadllah authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    876af5d View commit details
    Browse the repository at this point in the history
  15. USB: quirks: enable device-qualifier quirk for yet another Elan touch…

    …screen
    
    Yet another device affected by this.
    
    Tested-by: Kevin Fenzi <kevin@scrye.com>
    Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Adel Gadllah authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    d749947 View commit details
    Browse the repository at this point in the history
  16. xhci: no switching back on non-ULT Haswell

    The switch back is limited to ULT even on HP. The contrary
    finding arose by bad luck in BIOS versions for testing.
    This fixes spontaneous resume from S3 on some HP laptops.
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Oliver Neukum authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    b45abac View commit details
    Browse the repository at this point in the history
  17. uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models

    These drives hang when receiving ATA12 commands, so set the US_FL_NO_ATA_1X
    quirk to filter these out.
    
    Cc: stable@vger.kernel.org # 3.16
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jwrdegoede authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    d1d9548 View commit details
    Browse the repository at this point in the history
  18. usb: core: need to call usb_phy_notify_connect after device setup

    Since we notify disconnecting based on the usb device is existed
    (port_dev->child, the child device at roothub is not NULL), we
    need to notify connect after device has been registered.
    
    This fixes a bug that do fast plug in/out test, and the notify_disconnect
    is not called due to roothub child is NULL and the enumeration has failed.
    
    Cc: v3.17+ <stable@vger.kernel.org>
    Signed-off-by: Tony Zheng <Tony.Zheng@freescale.com>
    Signed-off-by: Peter Chen <peter.chen@freescale.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Tony Zheng authored and gregkh committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    01ed67d View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2014

  1. usb: core: notify disconnection when core detects disconnect

    It is safe to call notify disconnect when the usb core
    thinks the device is disconnected.
    
    This commit also fixes one bug found at below situation:
    we have not enabled usb wakeup, we do system suspend when
    there is an usb device at the port, after suspend, we plug out
    the usb device, then plug in device again. At that time,
    the nofity disconnect was not called at current code, as
    the controller doesn't know the usb device was disconnected
    during the suspend, but USB core knows the port has changed
    during that periods.
    
    So to fix this problem, and let the usb core call notify disconnect.
    
    Cc: 3.17+ <stable@vger.kernel.org>
    Signed-off-by: Peter Chen <peter.chen@freescale.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Peter Chen authored and gregkh committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    b2108f1 View commit details
    Browse the repository at this point in the history
  2. ARM: imx: clk-vf610: define PLL's clock tree

    So far, the required PLL's (PLL1/PLL2/PLL5) have been initialized
    by boot loader and the kernel code defined fixed rates according
    to those default configurations. Beginning with the USB PLL7 the
    code started to initialize the PLL's itself (using imx_clk_pllv3).
    
    However, since commit dc4805c
    (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver)
    imx_clk_pllv3 no longer takes care of the ENABLE and BYPASS bits,
    hence the USB PLL were not configured correctly anymore.
    
    This patch not only fixes those USB PLL's, but also makes use of
    the imx_clk_pllv3 for all PLL's and alignes the code with the PLL
    support of the i.MX6 series.
    
    Signed-off-by: Stefan Agner <stefan@agner.ch>
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    agners authored and shawnguo2 committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    c72c553 View commit details
    Browse the repository at this point in the history
  3. of: Fix overflow bug in string property parsing functions

    The string property read helpers will run off the end of the buffer if
    it is handed a malformed string property. Rework the parsers to make
    sure that doesn't happen. At the same time add new test cases to make
    sure the functions behave themselves.
    
    The original implementations of of_property_read_string_index() and
    of_property_count_strings() both open-coded the same block of parsing
    code, each with it's own subtly different bugs. The fix here merges
    functions into a single helper and makes the original functions static
    inline wrappers around the helper.
    
    One non-bugfix aspect of this patch is the addition of a new wrapper,
    of_property_read_string_array(). The new wrapper is needed by the
    device_properties feature that Rafael is working on and planning to
    merge for v3.19. The implementation is identical both with and without
    the new static inline wrapper, so it just got left in to reduce the
    churn on the header file.
    
    Signed-off-by: Grant Likely <grant.likely@linaro.org>
    Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
    Cc: Rob Herring <robh+dt@kernel.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Darren Hart <darren.hart@intel.com>
    Cc: <stable@vger.kernel.org>  # v3.3+: Drop selftest hunks that don't apply
    glikely committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    a87fa1d View commit details
    Browse the repository at this point in the history
  4. ARM: imx: Fix the removal of CONFIG_SPI option

    Since 64546e9 ("ARM: imx_v6_v7_defconfig updates") and commit
    0650f85 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI
    selection was dropped by savedefconfig for imx_v4_v5_defconfig and
    imx_v6_v7_defconfig.
    
    In order to keep the same behaviour as previous kernel versions and avoid
    regressions, let's add CONFIG_SPI option back.
    
    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    Fabio Estevam authored and shawnguo2 committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    89fbec5 View commit details
    Browse the repository at this point in the history
  5. Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup

    If we hit any errors in btrfs_lookup_csums_range, we'll loop through all
    the csums we allocate and free them.  But the code was using list_entry
    incorrectly, and ended up trying to free the on-stack list_head instead.
    
    This bug came from commit 0678b61
    
    btrfs: Don't BUG_ON kzalloc error in btrfs_lookup_csums_range()
    
    Signed-off-by: Chris Mason <clm@fb.com>
    Reported-by: Erik Berg <btrfs@slipsprogrammoer.no>
    cc: stable@vger.kernel.org # 3.3 or newer
    masoncl committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    6e5aafb View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2014

  1. Merge tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/shawnguo/linux into fixes
    
    Merge "ARM: imx: fixes for 3.18, 2nd round" from Shawn Guo:
    
    "This is the second round of i.MX fixes for 3.18.  The clk-vf610 fix is
    relatively big, because it needs some adaption to the change made by
    offending commit dc4805c (ARM: imx: remove ENABLE and BYPASS bits
    from clk-pllv3 driver).  And it should have been sent to you for earlier
    -rc inclusion, but unfortunately it got delayed for some time because
    Stefan wasn't aware of my email address change."
    
    The i.MX fixes for 3.18, 2nd round:
     - Fix a regression on Vybrid platform which is caused by commit
       dc4805c (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3
       driver), and results in a missing configuration on PLL clocks.
     - Fix a regression with i.MX defconfig files where CONFIG_SPI option
       gets lost accidentally.
    
    * tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (460 commits)
      ARM: imx: Fix the removal of CONFIG_SPI option
      ARM: imx: clk-vf610: define PLL's clock tree
      + Linux 3.18-rc3
    
    Signed-off-by: Olof Johansson <olof@lixom.net>
    olofj committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    83b3d53 View commit details
    Browse the repository at this point in the history
  2. MAINTAINERS: update bcm2835 entry

    Add Lee Jones as a new co-maintainer.
    
    The kernel.org repo moved to allow us both to push to it. Update
    MAINTAINERS to match.
    
    Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    swarren authored and olofj committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    8bcdd92 View commit details
    Browse the repository at this point in the history
  3. arm64: compat: Enable bpf syscall

    Following the arm32 commit 2d605a3 (ARM: enable bpf syscall), wire
    this syscall for arm64 compat as well.
    
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    ctmarinas committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    97b56be View commit details
    Browse the repository at this point in the history
  4. arm64: defconfig: update defconfig for 3.18

    This patch enables a few things missing from our defconfig:
    
      - PCI and MSI, including support for the x-gene host controller
      - BPF JIT
      - SPI, GPIO and MMC for Seattle
      - GPIO for x-gene
      - USB for Juno
      - RTC
    
    It also removes HMC_DRV, which was being built as a module for some
    reason.
    
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    wildea01 authored and ctmarinas committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    2d39ad6 View commit details
    Browse the repository at this point in the history
  5. staging:iio:ad5933: Fix NULL pointer deref when enabling buffer

    In older versions of the IIO framework it was possible to pass a
    completely different set of channels to iio_buffer_register() as the one
    that is assigned to the IIO device. Commit 959d295 ("staging:iio: make
    iio_sw_buffer_preenable much more general.") introduced a restriction that
    requires that the set of channels that is passed to iio_buffer_register() is
    a subset of the channels assigned to the IIO device as the IIO core will use
    the list of channels that is assigned to the device to lookup a channel by
    scan index in iio_compute_scan_bytes(). If it can not find the channel the
    function will crash. This patch fixes the issue by making sure that the same
    set of channels is assigned to the IIO device and passed to
    iio_buffer_register().
    
    Fixes the follow NULL pointer derefernce kernel crash:
    	Unable to handle kernel NULL pointer dereference at virtual address 00000016
    	pgd = d53d0000
    	[00000016] *pgd=1534e831, *pte=00000000, *ppte=00000000
    	Internal error: Oops: 17 [#1] PREEMPT SMP ARM
    	Modules linked in:
    	CPU: 1 PID: 1626 Comm: bash Not tainted 3.15.0-19969-g2a180eb-dirty #9545
    	task: d6c124c0 ti: d539a000 task.ti: d539a000
    	PC is at iio_compute_scan_bytes+0x34/0xa8
    	LR is at iio_compute_scan_bytes+0x34/0xa8
    	pc : [<c03052e4>]    lr : [<c03052e4>]    psr: 60070013
    	sp : d539beb8  ip : 00000001  fp : 00000000
    	r10: 00000002  r9 : 00000000  r8 : 00000001
    	r7 : 00000000  r6 : d6dc8800  r5 : d7571000  r4 : 00000002
    	r3 : d7571000  r2 : 00000044  r1 : 00000001  r0 : 00000000
    	Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
    	Control: 18c5387d  Table: 153d004a  DAC: 00000015
    	Process bash (pid: 1626, stack limit = 0xd539a240)
    	Stack: (0xd539beb8 to 0xd539c000)
    	bea0:                                                       c02fc0e4 d7571000
    	bec0: d76c1640 d6dc8800 d757117c 00000000 d757112c c0305b04 d76c1690 d76c1640
    	bee0: d7571188 00000002 00000000 d7571000 d539a000 00000000 000dd1c8 c0305d54
    	bf00: d7571010 0160b868 00000002 c69d3900 d7573278 d7573308 c69d3900 c01ece90
    	bf20: 00000002 c0103fac c0103f6c d539bf88 00000002 c69d3b00 c69d3b0c c0103468
    	bf40: 00000000 00000000 d7694a00 00000002 000af408 d539bf88 c000dd84 c00b2f94
    	bf60: d7694a00 000af408 00000002 d7694a00 d7694a00 00000002 000af408 c000dd84
    	bf80: 00000000 c00b32d0 00000000 00000000 00000002 b6f1aa78 00000002 000af408
    	bfa0: 00000004 c000dc00 b6f1aa78 00000002 00000001 000af408 00000002 00000000
    	bfc0: b6f1aa78 00000002 000af408 00000004 be806a4c 000a6094 00000000 000dd1c8
    	bfe0: 00000000 be8069cc b6e8ab77 b6ec125c 40070010 00000001 22940489 154a5007
    	[<c03052e4>] (iio_compute_scan_bytes) from [<c0305b04>] (__iio_update_buffers+0x248/0x438)
    	[<c0305b04>] (__iio_update_buffers) from [<c0305d54>] (iio_buffer_store_enable+0x60/0x7c)
    	[<c0305d54>] (iio_buffer_store_enable) from [<c01ece90>] (dev_attr_store+0x18/0x24)
    	[<c01ece90>] (dev_attr_store) from [<c0103fac>] (sysfs_kf_write+0x40/0x4c)
    	[<c0103fac>] (sysfs_kf_write) from [<c0103468>] (kernfs_fop_write+0x110/0x154)
    	[<c0103468>] (kernfs_fop_write) from [<c00b2f94>] (vfs_write+0xd0/0x160)
    	[<c00b2f94>] (vfs_write) from [<c00b32d0>] (SyS_write+0x40/0x78)
    	[<c00b32d0>] (SyS_write) from [<c000dc00>] (ret_fast_syscall+0x0/0x30)
    	Code: ea00000e e1a01008 e1a00005 ebfff6fc (e5d0a016)
    
    Fixes: 959d295 ("staging:iio: make iio_sw_buffer_preenable much more general.")
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: Stable@vger.kernel.org
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    larsclausen authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    4a53d3a View commit details
    Browse the repository at this point in the history
  6. staging:iio:ad5933: Drop "raw" from channel names

    "raw" is the name of a channel property, but should not be part of the
    channel name itself.
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    larsclausen authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    97fb303 View commit details
    Browse the repository at this point in the history
  7. iio: st_sensors: Fix buffer copy

    Use byte_for_channel as iterator to properly initialize the buffer.
    
    Signed-off-by: Robin van der Gracht <robin@protonic.nl>
    Acked-by: Denis Ciocca <denis.ciocca@st.com>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Cc: <Stable@vger.kernel.org>
    rvdgracht authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    c6b4cac View commit details
    Browse the repository at this point in the history
  8. iio: adc: mxs-lradc: Disable the clock on probe failure

    We should disable lradc->clk in the case of errors in the probe function.
    
    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Reviewed-by: Marek Vasut <marex@denx.de>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Cc: <Stable@vger.kernel.org>
    Fabio Estevam authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    4748119 View commit details
    Browse the repository at this point in the history
  9. iio: tsl4531: Fix compiler error when CONFIG_PM_OPS is not defined

    Fix the compiler error when the CONFIG_PM_OPS flag is not set.
    
    drivers/iio/light/tsl4531.c:235:8: error: ‘tsl4531_suspend’ undeclared here (not in a function)
    drivers/iio/light/tsl4531.c:235:8: error: ‘tsl4531_resume’ undeclared here (not in a function)
    
    Signed-off-by: Dan Murphy <dmurphy@ti.com>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Dan Murphy authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    03045bc View commit details
    Browse the repository at this point in the history
  10. io: accel: kxcjk-1013: Fix iio_event_spec direction

    Because IIO_EV_DIR_* are not bitmasks but enums,
    IIO_EV_DIR_RISING | IIO_EV_DIR_FALLING is not equal
    with IIO_EV_DIR_EITHER.
    
    This could lead to potential misformatted sysfs attributes
    like:
    	* in_accel_x_thresh_(null)_en
    	* in_accel_x_thresh_(null)_period
    	* in_accel_x_thresh_(null)_value
    
    or even memory corruption.
    
    Fixes: b4b491c (iio: accel: kxcjk-1013: Support threshold)
    Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Daniel Baluta authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    25afffe View commit details
    Browse the repository at this point in the history
  11. iio: as3935: allocate correct iio_device size

    Signed-off-by: George McCollister <george.mccollister@gmail.com>
    Acked-by: Hartmut Knaack <knaack.h@gmx.de>
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    gmccollister authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    f73cde6 View commit details
    Browse the repository at this point in the history
  12. staging:iio:ade7758: Fix NULL pointer deref when enabling buffer

    In older versions of the IIO framework it was possible to pass a completely
    different set of channels to iio_buffer_register() as the one that is
    assigned to the IIO device. Commit 959d295 ("staging:iio: make
    iio_sw_buffer_preenable much more general.") introduced a restriction that
    requires that the set of channels that is passed to iio_buffer_register() is
    a subset of the channels assigned to the IIO device as the IIO core will use
    the list of channels that is assigned to the device to lookup a channel by
    scan index in iio_compute_scan_bytes(). If it can not find the channel the
    function will crash. This patch fixes the issue by making sure that the same
    set of channels is assigned to the IIO device and passed to
    iio_buffer_register().
    
    Note that we need to remove the IIO_CHAN_INFO_RAW and IIO_CHAN_INFO_SCALE
    info attributes from the channels since we don't actually want those to be
    registered.
    
    Fixes the following crash:
    	Unable to handle kernel NULL pointer dereference at virtual address 00000016
    	pgd = d2094000
    	[00000016] *pgd=16e39831, *pte=00000000, *ppte=00000000
    	Internal error: Oops: 17 [#1] PREEMPT SMP ARM
    	Modules linked in:
    	CPU: 1 PID: 1695 Comm: bash Not tainted 3.17.0-06329-g29461ee #9686
    	task: d7768040 ti: d5bd4000 task.ti: d5bd4000
    	PC is at iio_compute_scan_bytes+0x38/0xc0
    	LR is at iio_compute_scan_bytes+0x34/0xc0
    	pc : [<c0316de8>]    lr : [<c0316de4>]    psr: 60070013
    	sp : d5bd5ec0  ip : 00000000  fp : 00000000
    	r10: d769f934  r9 : 00000000  r8 : 00000001
    	r7 : 00000000  r6 : c8fc6240  r5 : d769f800  r4 : 00000000
    	r3 : d769f800  r2 : 00000000  r1 : ffffffff  r0 : 00000000
    	Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
    	Control: 18c5387d  Table: 1209404a  DAC: 00000015
    	Process bash (pid: 1695, stack limit = 0xd5bd4240)
    	Stack: (0xd5bd5ec0 to 0xd5bd6000)
    	5ec0: d769f800 d7435640 c8fc6240 d769f984 00000000 c03175a4 d7435690 d7435640
    	5ee0: d769f990 00000002 00000000 d769f800 d5bd4000 00000000 000b43a8 c03177f4
    	5f00: d769f810 0162b8c8 00000002 c8fc7e00 d77f1d08 d77f1da8 c8fc7e00 c01faf1c
    	5f20: 00000002 c010694c c010690c d5bd5f88 00000002 c8fc6840 c8fc684c c0105e08
    	5f40: 00000000 00000000 d20d1580 00000002 000af408 d5bd5f88 c000de84 c00b76d4
    	5f60: d20d1580 000af408 00000002 d20d1580 d20d1580 00000002 000af408 c000de84
    	5f80: 00000000 c00b7a44 00000000 00000000 00000002 b6ebea78 00000002 000af408
    	5fa0: 00000004 c000dd00 b6ebea78 00000002 00000001 000af408 00000002 00000000
    	5fc0: b6ebea78 00000002 000af408 00000004 bee96a4c 000a6094 00000000 000b43a8
    	5fe0: 00000000 bee969cc b6e2eb77 b6e6525c 40070010 00000001 00000000 00000000
    	[<c0316de8>] (iio_compute_scan_bytes) from [<c03175a4>] (__iio_update_buffers+0x248/0x438)
    	[<c03175a4>] (__iio_update_buffers) from [<c03177f4>] (iio_buffer_store_enable+0x60/0x7c)
    	[<c03177f4>] (iio_buffer_store_enable) from [<c01faf1c>] (dev_attr_store+0x18/0x24)
    	[<c01faf1c>] (dev_attr_store) from [<c010694c>] (sysfs_kf_write+0x40/0x4c)
    	[<c010694c>] (sysfs_kf_write) from [<c0105e08>] (kernfs_fop_write+0x110/0x154)
    	[<c0105e08>] (kernfs_fop_write) from [<c00b76d4>] (vfs_write+0xbc/0x170)
    	[<c00b76d4>] (vfs_write) from [<c00b7a44>] (SyS_write+0x40/0x78)
    	[<c00b7a44>] (SyS_write) from [<c000dd00>] (ret_fast_syscall+0x0/0x30)
    
    Fixes: 959d295 ("staging:iio: make iio_sw_buffer_preenable much more general.")
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    larsclausen authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    e105547 View commit details
    Browse the repository at this point in the history
  13. staging:iio:ade7758: Fix check if channels are enabled in prenable

    We should check if a channel is enabled, not if no channels are enabled.
    
    Fixes: 550268c ("staging:iio: scrap scan_count and ensure all drivers use active_scan_mask")
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    larsclausen authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    79fa64e View commit details
    Browse the repository at this point in the history
  14. staging:iio:ade7758: Remove "raw" from channel name

    "raw" is a property of a channel, but should not be part of the name of
    channel.
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    larsclausen authored and jic23 committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    b598aac View commit details
    Browse the repository at this point in the history
  15. ARM: dts: vf610: add SD node to cosmic dts

    Driver has been there since a while back, but the dts never seems to
    have been updated with the node (nor pinctrl). Do so now.
    
    Cc: Matt Porter <mporter@linaro.org>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    Acked-by: Stefan Agner <stefan@agner.ch>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    olofj committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    ab699bc View commit details
    Browse the repository at this point in the history
  16. Revert "storage: Replace magic number with define in usb_stor_euscsi_…

    …init()"
    
    This reverts commit bda9893 as it was
    incorrect.
    
    Reported-by: Mark Knibbs <markk@clara.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    gregkh committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    ac0225f View commit details
    Browse the repository at this point in the history
  17. USB: cdc-acm: only raise DTR on transitions from B0

    Make sure to only raise DTR on transitions from B0 in set_termios.
    
    Also allow set_termios to be called from open with a termios_old of
    NULL. Note that DTR will not be raised prematurely in this case.
    
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jhovold authored and gregkh committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    4473d05 View commit details
    Browse the repository at this point in the history
  18. Merge tag 'iio-fixes-for-3.18b' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/jic23/iio into staging-linus
    
    Jonathan writes:
    
    Second round of IIO fixes for the 3.18 cycle.
    
    * tsl4531 - fix a compile error when CONFIG_PM_OPS not set.
    * kxcjk-1013 - event spec direction was invalid - leading to 'interesting'
      attrribute names.
    * as3935 - sizeof(st) used instead of sizeof(*st) leading to allocation of
      space for a pointer rather than the structure desired.
    * ade7758 - Another null pointer deref fix due to different channels
      being provided to the the buffer register than used for the sysfs
      side of things.
    * ade7758 - Check there is a channel enabled in preenable for the buffer
      before doing anything.
    * ade7758 - Drop a stray raw from the channel name that leads to _raw_raw
      postfix.
    gregkh committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    bce20b2 View commit details
    Browse the repository at this point in the history
  19. USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huaw…

    …ei_e220_init()
    
    The timeout argument to usb_stor_control_msg() is specified in jiffies, not
    milliseconds.
    
    Signed-off-by: Mark Knibbs <markk@clara.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    M-a-r-k authored and gregkh committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    a88098b View commit details
    Browse the repository at this point in the history
  20. phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly

    The USB OTG port does not work since v3.16 on omap platform.
    This is a regression introduced by the commit
    eb82a3d (phy: omap-usb2: Balance pm_runtime_enable() on probe failure
     and remove).
    This because the call to pm_runtime_enable() function is moved after the
    call to devm_phy_create() function, which has side effect since later in
    the subsequent calls of devm_phy_create() there is a check with
    pm_runtime_enabled() to configure few things.
    
    Fixes: eb82a3d
    Signed-off-by: Oussama Ghorbel <ghorbel@pivasoftware.com>
    Tested-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Oussama Ghorbel authored and gregkh committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    f20531a View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2014

  1. serial: Fix divide-by-zero fault in uart_get_divisor()

    uart_get_baud_rate() will return baud == 0 if the max rate is set
    to the "magic" 38400 rate and the SPD_* flags are also specified.
    On the first iteration, if the current baud rate is higher than the
    max, the baud rate is clamped at the max (which in the degenerate
    case is 38400). On the second iteration, the now-"magic" 38400 baud
    rate selects the possibly higher alternate baud rate indicated by
    the SPD_* flag. Since only two loop iterations are performed, the
    loop is exited, a kernel WARNING is generated and a baud rate of
    0 is returned.
    
    Reproducible with:
     setserial /dev/ttyS0 spd_hi base_baud 38400
    
    Only perform the "magic" 38400 -> SPD_* baud transform on the first
    loop iteration, which prevents the degenerate case from recognizing
    the clamped baud rate as the "magic" 38400 value.
    
    Reported-by: Robert Święcki <robert@swiecki.net>
    Cc: <stable@vger.kernel.org> # all
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    peterhurley authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    547039e View commit details
    Browse the repository at this point in the history
  2. tty: Fix high cpu load if tty is unreleaseable

    Kernel oops can cause the tty to be unreleaseable (for example, if
    n_tty_read() crashes while on the read_wait queue). This will cause
    tty_release() to endlessly loop without sleeping.
    
    Use a killable sleep timeout which grows by 2n+1 jiffies over the interval
    [0, 120 secs.) and then jumps to forever (but still killable).
    
    NB: killable just allows for the task to be rewoken manually, not
    to be terminated.
    
    Cc: <stable@vger.kernel.org> # since before 2.6.32
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    peterhurley authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    37b1645 View commit details
    Browse the repository at this point in the history
  3. tty: Prevent "read/write wait queue active!" log flooding

    Only print one warning when a task is on the read_wait or write_wait
    wait queue at final tty release.
    
    Cc: <stable@vger.kernel.org> # 3.4.x+
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    peterhurley authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    494c1ea View commit details
    Browse the repository at this point in the history
  4. dma: edma: move device registration to platform code

    The horrible split between the low-level part of the edma support
    and the dmaengine front-end driver causes problems on multiplatform
    kernels. This is an attempt to improve the situation slightly
    by only registering the dmaengine devices that are actually
    present.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    [olof: add missing include of linux/dma-mapping.h]
    Signed-off-by: Olof Johansson <olof@lixom.net>
    
    Signed-off-by: Olof Johansson <olof@lixom.net>
    arndb authored and olofj committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    5305e4d View commit details
    Browse the repository at this point in the history
  5. tty: serial: 8250_mtk: Fix quot calculation

    The calculation of value quot for highspeed register set to three
    was wrong. This patch fixes the calculation so that the serial port
    for baudrates bigger then 576000 baud is working correctly.
    
    Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    mbgg authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    cd92208 View commit details
    Browse the repository at this point in the history
  6. tty/vt: don't set font mappings on vc not supporting this

    We can call this function for a dummy console that doesn't support
    setting the font mapping, which will result in a null ptr BUG. So check
    for this case and return error for consoles w/o font mapping support.
    
    Reference: https://bugzilla.kernel.org/show_bug.cgi?id=59321
    Signed-off-by: Imre Deak <imre.deak@intel.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ideak authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    9e326f7 View commit details
    Browse the repository at this point in the history
  7. serial: of-serial: fix uninitialized kmalloc variable

    The info pointer points to an uninitialized kmalloced space.
    If a device doesn't have clk property, then info->clk may
    have unpredicated value and cause call trace. So use kzalloc
    to make sure it is NULL initialized.
    
    Signed-off-by: Jingchang Lu <jingchang.lu@freescale.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Jingchang Lu authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    7e12e67 View commit details
    Browse the repository at this point in the history
  8. Merge tag 'usb-serial-3.18-rc4' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/johan/usb-serial into usb-linus
    
    Johan writes:
    
    USB-serial fixes for v3.18-rc4
    
    Two fixes of non-atomic allocations in write paths.
    
    Signed-off-by: Johan Hovold <johan@kernel.org>
    gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    5002921 View commit details
    Browse the repository at this point in the history
  9. tty: Fix pty master poll() after slave closes v2

    Commit f95499c ("n_tty: Don't wait for buffer work in read() loop")
    introduces a race window where a pty master can be signalled that the pty
    slave was closed before all the data that the slave wrote is delivered.
    Commit f8747d4 ("tty: Fix pty master read() after slave closes") fixed the
    problem in case of n_tty_read, but the problem still exists for n_tty_poll.
    This can be seen by running 'for ((i=0; i<100;i++));do ./test.py ;done'
    where test.py is:
    
    import os, select, pty
    
    (pid, pty_fd) = pty.fork()
    
    if pid == 0:
       os.write(1, 'This string should be received by parent')
    else:
       poller = select.epoll()
       poller.register( pty_fd, select.EPOLLIN )
       ready = poller.poll( 1 * 1000 )
       for fd, events in ready:
          if not events & select.EPOLLIN:
             print 'missed POLLIN event'
          else:
             print os.read(fd, 100)
       poller.close()
    
    The string from the slave is missed several times.
    This patch takes the same approach as the fix for read and special cases
    this condition for poll.
    Tested on 3.16.
    
    Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Francesco Ruggeri authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    c4dc304 View commit details
    Browse the repository at this point in the history
  10. Merge tag 'fixes-for-v3.18-rc4' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/balbi/usb into usb-linus
    
    Felipe writes:
    
    usb: fixes for v3.18-rc4
    
    A single fix this for dwc2 this time. Because of
    excessive debugging messages, dwc2 would sometimes
    fail enumeration. The fix is simple, just converting
    a dev_info() into dev_dbg().
    
    Signed-off-by: Felipe Balbi <balbi@ti.com>
    gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    e5452dd View commit details
    Browse the repository at this point in the history
  11. USB: cdc-acm: add quirk for control-line state requests

    Add new quirk for devices that cannot handle control-line state
    requests.
    
    Note that we currently send these requests to all devices, regardless of
    whether they claim to support it, but that errors are only logged if
    support is claimed.
    
    Since commit 0943d8e ("USB: cdc-acm: use tty-port dtr_rts"), which
    only changed the timings for these requests slightly, this has been
    reported to cause occasional firmware crashes on Simtec Electronics
    Entropy Key devices after re-enumeration. Enable the quirk for this
    device.
    
    Reported-by: Nix <nix@esperi.org.uk>
    Tested-by: Nix <nix@esperi.org.uk>
    Cc: stable <stable@vger.kernel.org>	# v3.16
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jhovold authored and gregkh committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    2a8cdfd View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2014

  1. sysfs: driver core: Fix glue dir race condition by gdp_mutex

    There is a race condition when removing glue directory.
    It can be reproduced in following test:
    
    path 1: Add first child device
    device_add()
        get_device_parent()
                /*find parent from glue_dirs.list*/
                list_for_each_entry(k, &dev->class->p->glue_dirs.list, entry)
                        if (k->parent == parent_kobj) {
                                kobj = kobject_get(k);
                                break;
                        }
                ....
                class_dir_create_and_add()
    
    path2: Remove last child device under glue dir
    device_del()
        cleanup_device_parent()
                cleanup_glue_dir()
                        kobject_put(glue_dir);
    
    If path2 has been called cleanup_glue_dir(), but not
    call kobject_put(glue_dir), the glue dir is still
    in parent's kset list. Meanwhile, path1 find the glue
    dir from the glue_dirs.list. Path2 may release glue dir
    before path1 call kobject_get(). So kernel will report
    the warning and bug_on.
    
    This is a "classic" problem we have of a kref in a list
    that can be found while the last instance could be removed
    at the same time.
    
    This patch reuse gdp_mutex to fix this race condition.
    
    The following calltrace is captured in kernel 3.4, but
    the latest kernel still has this bug.
    
    -----------------------------------------------------
    <4>[ 3965.441471] WARNING: at ...include/linux/kref.h:41 kobject_get+0x33/0x40()
    <4>[ 3965.441474] Hardware name: Romley
    <4>[ 3965.441475] Modules linked in: isd_iop(O) isd_xda(O)...
    ...
    <4>[ 3965.441605] Call Trace:
    <4>[ 3965.441611]  [<ffffffff8103717a>] warn_slowpath_common+0x7a/0xb0
    <4>[ 3965.441615]  [<ffffffff810371c5>] warn_slowpath_null+0x15/0x20
    <4>[ 3965.441618]  [<ffffffff81215963>] kobject_get+0x33/0x40
    <4>[ 3965.441624]  [<ffffffff812d1e45>] get_device_parent.isra.11+0x135/0x1f0
    <4>[ 3965.441627]  [<ffffffff812d22d4>] device_add+0xd4/0x6d0
    <4>[ 3965.441631]  [<ffffffff812d0dbc>] ? dev_set_name+0x3c/0x40
    ....
    <2>[ 3965.441912] kernel BUG at ..../fs/sysfs/group.c:65!
    <4>[ 3965.441915] invalid opcode: 0000 [#1] SMP
    ...
    <4>[ 3965.686743]  [<ffffffff811a677e>] sysfs_create_group+0xe/0x10
    <4>[ 3965.686748]  [<ffffffff810cfb04>] blk_trace_init_sysfs+0x14/0x20
    <4>[ 3965.686753]  [<ffffffff811fcabb>] blk_register_queue+0x3b/0x120
    <4>[ 3965.686756]  [<ffffffff812030bc>] add_disk+0x1cc/0x490
    ....
    -------------------------------------------------------
    
    Signed-off-by: Yijing Wang <wangyijing@huawei.com>
    Signed-off-by: Weng Meiling <wengmeiling.weng@huawei.com>
    Cc: <stable@vger.kernel.org> #3.4+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    YijingWang authored and gregkh committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    e4a60d1 View commit details
    Browse the repository at this point in the history
  2. USB: Update default usb-storage delay_use value in kernel-parameters.txt

    Back in 2010 the default usb-storage delay_use time was reduced from 5 to 1
    second (commit a4a47bc), but
    kernel-parameters.txt wasn't updated to reflect that.
    
    Signed-off-by: Mark Knibbs <markk@clara.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    M-a-r-k authored and gregkh committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    1910195 View commit details
    Browse the repository at this point in the history
  3. tiny: reverse logic for DISABLE_DEV_COREDUMP

    It's desirable for allnconfig and tinyconfig targets to result in the
    least amount of code possible. DISABLE_DEV_COREDUMP exists as a way to
    switch off DEV_COREDUMP regardless if any drivers select
    WANT_DEV_COREDUMP.
    
    This patch renames the option to ENABLE_DEV_COREDUMP and setting it to
    'n' (as in allnconfig or tinyconfig) will effectively disable device
    coredump.
    
    Cc: Josh Triplett <josh@joshtriplett.org>
    Reviewed-by: Josh Triplett <josh@joshtriplett.org>
    Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
    Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
    Acked-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    aristeu authored and gregkh committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    9c60269 View commit details
    Browse the repository at this point in the history
  4. tiny: rename ENABLE_DEV_COREDUMP to ALLOW_DEV_COREDUMP

    The ENABLE_DEV_COREDUMP option is misleading as it implies that
    it gets the framework enabled, this isn't true it just allows it
    to get enabled if a driver needs it.
    
    Rename it to ALLOW_DEV_COREDUMP to better capture its semantics.
    
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Reviewed-by: Josh Triplett <josh@joshtriplett.org>
    Acked-by: Aristeu Rozanski <aris@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jmberg-intel authored and gregkh committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    cd3d9ea View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2014

  1. ARM: dts: zynq: Enable PL clocks for Parallella

    The Parallella board comes with a U-Boot bootloader that loads one of
    two predefined FPGA bitstreams before booting the kernel. Both define an
    AXI interface to the on-board Epiphany processor.
    
    Enable clocks FCLK0..FCLK3 for the Programmable Logic by default.
    
    Otherwise accessing, e.g., the ESYSRESET register freezes the board,
    as seen with the Epiphany SDK tools e-reset and e-hw-rev, using /dev/mem.
    
    Cc: <stable@vger.kernel.org> # 3.17.x
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    Acked-by: Michal Simek <michal.simek@xilinx.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    afaerber authored and olofj committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    92c9e0c View commit details
    Browse the repository at this point in the history
  2. Merge tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/gregkh/usb
    
    Pull USB fixes from Greg KH:
     "Here are some USB fixes for 3.18-rc4.
    
      Just a bunch of little fixes resolving reported issues and new device
      ids for existing drivers.  Full details are in the shortlog"
    
    * tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
      USB: Update default usb-storage delay_use value in kernel-parameters.txt
      USB: cdc-acm: add quirk for control-line state requests
      phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
      USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init()
      USB: cdc-acm: only raise DTR on transitions from B0
      Revert "storage: Replace magic number with define in usb_stor_euscsi_init()"
      usb: core: notify disconnection when core detects disconnect
      usb: core: need to call usb_phy_notify_connect after device setup
      uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models
      xhci: no switching back on non-ULT Haswell
      USB: quirks: enable device-qualifier quirk for yet another Elan touchscreen
      USB: quirks: enable device-qualifier quirk for another Elan touchscreen
      MAINTAINERS: Remove duplicate entry for usbip driver
      usb: storage: fix build warnings !CONFIG_PM
      usb: Remove references to non-existent PLAT_S5P symbol
      uas: Add NO_ATA_1X for VIA VL711 devices
      xhci: Disable streams on Asmedia 1042 xhci controllers
      USB: HWA: fix a warning message
      uas: Add US_FL_NO_ATA_1X quirk for 1 more Seagate model
      usb-storage: handle a skipped data phase
      ...
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    b942791 View commit details
    Browse the repository at this point in the history
  3. Merge tag 'tty-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/gregkh/tty
    
    Pull tty/serial fixes from Greg KH:
     "Here are some tiny serial/tty fixes for 3.18-rc4 that resolve some
      reported issues"
    
    * tag 'tty-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
      tty: Fix pty master poll() after slave closes v2
      serial: of-serial: fix uninitialized kmalloc variable
      tty/vt: don't set font mappings on vc not supporting this
      tty: serial: 8250_mtk: Fix quot calculation
      tty: Prevent "read/write wait queue active!" log flooding
      tty: Fix high cpu load if tty is unreleaseable
      serial: Fix divide-by-zero fault in uart_get_divisor()
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    45a4c07 View commit details
    Browse the repository at this point in the history
  4. Merge tag 'staging-3.18-rc4' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/gregkh/staging
    
    Pull staging driver fixes from Greg KH:
     "Here are some staging/iio fixes for 3.18-rc4.
    
      Nothing major, just a few bugfixes of things that have been reported"
    
    * tag 'staging-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      staging:iio:ade7758: Remove "raw" from channel name
      staging:iio:ade7758: Fix check if channels are enabled in prenable
      staging:iio:ade7758: Fix NULL pointer deref when enabling buffer
      iio: as3935: allocate correct iio_device size
      io: accel: kxcjk-1013: Fix iio_event_spec direction
      iio: tsl4531: Fix compiler error when CONFIG_PM_OPS is not defined
      iio: adc: mxs-lradc: Disable the clock on probe failure
      iio: st_sensors: Fix buffer copy
      staging:iio:ad5933: Drop "raw" from channel names
      staging:iio:ad5933: Fix NULL pointer deref when enabling buffer
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    86a7a16 View commit details
    Browse the repository at this point in the history
  5. Merge tag 'driver-core-3.18-rc4' of git://git.kernel.org/pub/scm/linu…

    …x/kernel/git/gregkh/driver-core
    
    Pull driver core fixes from Greg KH:
     "Here are 3 tiny fixes for 3.18-rc4.
    
      One fixes up a long-stading race condition in the driver core for
      removing directories in /sys/devices/virtual/ and the other 2 fix up
      the wording of a new Kconfig option that was added in 3.18-rc1"
    
    * tag 'driver-core-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
      tiny: rename ENABLE_DEV_COREDUMP to ALLOW_DEV_COREDUMP
      tiny: reverse logic for DISABLE_DEV_COREDUMP
      sysfs: driver core: Fix glue dir race condition by gdp_mutex
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    0b0c7db View commit details
    Browse the repository at this point in the history
  6. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mason/linux-btrfs
    
    Pull btrfs fix from Chris Mason:
     "It's a one liner for an error cleanup path that leads to crashes"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    c4c23fb View commit details
    Browse the repository at this point in the history
  7. Merge branch 'devicetree/merge' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/glikely/linux
    
    Pull devicetree bugfix from Grant Likely:
     "One buffer overflow bug that shouldn't be left around"
    
    * 'devicetree/merge' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
      of: Fix overflow bug in string property parsing functions
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    a315780 View commit details
    Browse the repository at this point in the history
  8. Merge tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/arm/arm-soc
    
    Pull ARM SoC fixes from Olof Johansson:
     "Another quiet week:
    
       - a fix to silence edma probe error on non-supported platforms from
         Arnd
       - a fix to enable the PL clock for Parallella, to make mainline
         usable with the SDK.
       - a somewhat verbose fix for the PLL clock tree on VF610
       - enabling of SD/MMC on one of the VF610-based boards (for testing)
       - a fix for i.MX where CONFIG_SPI used to be implicitly enabled and
         now needs to be added to the defconfig instead
       - another maintainer added for bcm2835: Lee Jones"
    
    * tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: dts: zynq: Enable PL clocks for Parallella
      dma: edma: move device registration to platform code
      ARM: dts: vf610: add SD node to cosmic dts
      MAINTAINERS: update bcm2835 entry
      ARM: imx: Fix the removal of CONFIG_SPI option
      ARM: imx: clk-vf610: define PLL's clock tree
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    b1f368b View commit details
    Browse the repository at this point in the history
  9. Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/arm64/linux
    
    Pull arm64 fixes from Catalin Marinas:
     - enable bpf syscall for compat
     - cpu_suspend fix when checking the idle state type
     - defconfig update
    
    * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
      arm64: defconfig: update defconfig for 3.18
      arm64: compat: Enable bpf syscall
      arm64: psci: fix cpu_suspend to check idle state type for index
    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    ee867cf View commit details
    Browse the repository at this point in the history
  10. Linux 3.18-rc4

    torvalds committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    206c5f6 View commit details
    Browse the repository at this point in the history