1. 02 May, 2015 2 commits
  2. 01 May, 2015 3 commits
    • Ilya Dryomov's avatar
      rbd: end I/O the entire obj_request on error · 082a75da
      Ilya Dryomov authored
      When we end I/O struct request with error, we need to pass
      obj_request->length as @nr_bytes so that the entire obj_request worth
      of bytes is completed.  Otherwise block layer ends up confused and we
      trip on
      
          rbd_assert(more ^ (which == img_request->obj_request_count));
      
      in rbd_img_obj_callback() due to more being true no matter what.  We
      already do it in most cases but we are missing some, in particular
      those where we don't even get a chance to submit any obj_requests, due
      to an early -ENOMEM for example.
      
      A number of obj_request->xferred assignments seem to be redundant but
      I haven't touched any of obj_request->xferred stuff to keep this small
      and isolated.
      
      Cc: Alex Elder <elder@linaro.org>
      Cc: stable@vger.kernel.org # 3.10+
      Reported-by: default avatarShawn Edwards <lesser.evil@gmail.com>
      Reviewed-by: default avatarSage Weil <sage@redhat.com>
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      082a75da
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 64887b68
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "A few more btrfs fixes.
      
        These range from corners Filipe found in the new free space cache
        writeback to a grab bag of fixes from the list"
      
      * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: btrfs_release_extent_buffer_page didn't free pages of dummy extent
        Btrfs: fill ->last_trans for delayed inode in btrfs_fill_inode.
        btrfs: unlock i_mutex after attempting to delete subvolume during send
        btrfs: check io_ctl_prepare_pages return in __btrfs_write_out_cache
        btrfs: fix race on ENOMEM in alloc_extent_buffer
        btrfs: handle ENOMEM in btrfs_alloc_tree_block
        Btrfs: fix find_free_dev_extent() malfunction in case device tree has hole
        Btrfs: don't check for delalloc_bytes in cache_save_setup
        Btrfs: fix deadlock when starting writeback of bg caches
        Btrfs: fix race between start dirty bg cache writeout and bg deletion
      64887b68
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 036f351e
      Linus Torvalds authored
      Pull arm64 fixes from Will Deacon:
       "Not too much here, but we've addressed a couple of nasty issues in the
        dma-mapping code as well as adding the halfword and byte variants of
        load_acquire/store_release following on from the CSD locking bug that
        you fixed in the core.
      
         - fix perf devicetree warnings at probe time
      
         - fix memory leak in __dma_free()
      
         - ensure DMA buffers are always zeroed
      
         - show IRQ trigger in /proc/interrupts (for parity with ARM)
      
         - implement byte and halfword access for smp_{load_acquire,store_release}"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: perf: Fix the pmu node name in warning message
        arm64: perf: don't warn about missing interrupt-affinity property for PPIs
        arm64: add missing PAGE_ALIGN() to __dma_free()
        arm64: dma-mapping: always clear allocated buffers
        ARM64: Enable CONFIG_GENERIC_IRQ_SHOW_LEVEL
        arm64: add missing data types in smp_load_acquire/smp_store_release
      036f351e
  3. 30 Apr, 2015 14 commits
  4. 29 Apr, 2015 10 commits
  5. 28 Apr, 2015 11 commits
    • Chris Bainbridge's avatar
      ACPI / SBS: Enable battery manager when present · 61f8ff69
      Chris Bainbridge authored
      Commit 9faf6136 (ACPI / SBS: Disable smart battery manager on
      Apple) introduced a regression disabling the SBS battery manager.
      The battery manager should be marked as present when
      acpi_manager_get_info() returns 0.
      
      Fixes: 9faf6136 (ACPI / SBS: Disable smart battery manager on Apple)
      Signed-off-by: default avatarChris Bainbridge <chris.bainbridge@gmail.com>
      Cc: 3.18+ <stable@vger.kernel.org> # 3.18+
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      61f8ff69
    • Olaf Hering's avatar
      ACPICA: remove duplicate u8 typedef · 9e9d55e6
      Olaf Hering authored
      During commit e252652f ("ACPICA: acpidump: Remove integer types
      translation protection.") two 'unsigned char' types got converted to 'u8'.
      
      The result does not compile with gcc-4.5, it can not cope with duplicate
      typedefs.
      Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      9e9d55e6
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 3d99e3fe
      Linus Torvalds authored
      Pull arch/tile bugfix from Chris Metcalf:
       "This just fixes a compiler warning from an old bug that only recently
        started generating a warning"
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: properly use node_isset() on a nodemask_t
      3d99e3fe
    • Soeren Grunewald's avatar
      serial: 8250_pci: Add support for 16 port Exar boards · 96a5d18b
      Soeren Grunewald authored
      The Exar XR17V358 chip usually provides only 8 ports. But two chips can be
      combined to act as a single 16 port chip. Therefor one chip is configured
      as master the second as slave by connecting the mode pin to VCC (master)
      or GND (slave).
      
      Then the master chip is reporting a different device-id depending on
      whether a slave is detected or not. The UARTs 8-15 are addressed from
      0x2000-0x3fff. So the offset of 0x400 from UART to UART can be used to
      address all 16 ports as before.
      
      See: https://www.exar.com/common/content/document.ashx?id=1587 page 11
      Signed-off-by: default avatarSoeren Grunewald <soeren.grunewald@desy.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      96a5d18b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 14bc84ce
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "One additional new feature for 4.1, a new PRNG based on SHA-512 for
        the zcrypt driver.
      
        Two memory management related changes, the page table reallocation for
        KVM is removed, and with file ptes gone the encoding of page table
        entries is improved.
      
        And three bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/zcrypt: Introduce new SHA-512 based Pseudo Random Generator.
        s390/mm: change swap pte encoding and pgtable cleanup
        s390/mm: correct transfer of dirty & young bits in __pmd_to_pte
        s390/bpf: add dependency to z196 features
        s390/3215: free memory in error path
        s390/kvm: remove delayed reallocation of page tables for KVM
        kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP
      14bc84ce
    • Takashi Iwai's avatar
      ALSA: emux: Fix mutex deadlock in OSS emulation · 1c94e65c
      Takashi Iwai authored
      The OSS emulation in synth-emux helper has a potential AB/BA deadlock
      at the simultaneous closing and opening:
      
        close ->
          snd_seq_release() ->
            sne_seq_free_client() ->
              snd_seq_delete_all_ports(): takes client->ports_mutex ->
      	  port_delete() ->
      	    snd_emux_unuse(): takes emux->register_mutex
      
        open ->
          snd_seq_oss_open() ->
            snd_emux_open_seq_oss(): takes emux->register_mutex ->
              snd_seq_event_port_attach() ->
      	  snd_seq_create_port(): takes client->ports_mutex
      
      This patch addresses the deadlock by reducing the rance taking
      emux->register_mutex in snd_emux_open_seq_oss().  The lock is needed
      for the refcount handling, so move it locally.  The calls in
      emux_seq.c are already with the mutex, thus they are replaced with the
      version without mutex lock/unlock.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      1c94e65c
    • Rajeev Kumar's avatar
      ASoC: Update email-id of Rajeev Kumar · 9d7dd6cd
      Rajeev Kumar authored
      rajeev-dlh.kumar@st.com email-id doesn't exist anymore as I have left the
      company.  Replace ST's id with Rajeev Kumar <rajeevkumar.linux@gmail.com>
      Signed-off-by: default avatarRajeev Kumar <rajeevkumar.linux@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      9d7dd6cd
    • Chris Metcalf's avatar
      tile: properly use node_isset() on a nodemask_t · 9b0f5d63
      Chris Metcalf authored
      The code accidentally used cpu_isset() previously in one place
      (though properly node_isset() elsewhere).
      Signed-off-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
      9b0f5d63
    • Robert Baldyga's avatar
      serial: samsung: fix serial console break · 31c6ba97
      Robert Baldyga authored
      This patch fixes problems with serial console break. When function
      s3c64xx_serial_startup() was started while serial console has been working,
      it caused lose of characters written to TX FIFO. This effect was particularly
      observable with systemd, which closes serial port every time when it's
      not currently needed, hence function s3c64xx_serial_startup() is called
      quite often there. To fix this problem we avoid resetting TX FIFO if port is
      used as serial console.
      
      Example of broken console log:
      
      [ 1086.7         Expecting device dev-ttySAC1.device...
      [ 1086.[  OK  ] Reached target Paths.
      [ 1086.756416] s[  OK  ] Reached target Swap.
      [ 1086.776413] systemd[1]: Reached target Swap.
      [ 1086.776642] systemd[1]: Starting Root Slice.
      [    5.53403[  OK  ] Created slice Root Slice.
      [    5.548433] systemd[1]: Create[  OK  ] Created slice User and Session Slice.
      [    5.568414] sys[  OK  ] Listening on /dev/initctl Compatibility Named Pipe.
      [    5.588388] s[  OK  ] Listening on Delayed Shutdown Socket.
      [    5.608376] sy[  OK  ] Listening on Journal Socket (/dev/log).
      [    5.628361] [  OK  ] Listening on udev Kernel Socket.
      [    5.648357] s[  OK  ] Listening on udev Control Socket.
      [    5.668353] s[  OK  ] Listening on Journal Socket.
      [    5.688366] systemd[1]: Listeni[  OK  ] Created slice System Slice.
      [    5.708393]          Mounting Temporary Directory...
      [ 7139.067436]          Starting prepare device daemon...
      [ 7139.091726] sy         Starting Generate environment from /etc/profile.d...
      [    5.792867] system         Starting Create Static Device Nodes in /dev...
      [ 7848.718         Mounting Debug File System...
      [ 7848.7384         Mounting Configuration File System...
      [    5.852         Starting Apply Kernel Variables...
      [    5.8720         Starting Setup Virtual Console...
      [ 7848.798         Starting udev Coldplug all Devices...
      [ 7848.817         Starting Journal Service...
      [  OK  ] Started Journal Service.
      [ 7848.854222] s[  OK  ] Reached target Slices.
               Starting Remount Root and Kernel File Systems...
      [  OK  ] Mounted Configuration File System.
      Reported-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
      Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
      Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      31c6ba97
    • Ludovic Desroches's avatar
      tty/serial: at91: maxburst was missing for dma transfers · a8d4e016
      Ludovic Desroches authored
      Maxburst was not set when doing the dma slave configuration. This value
      is checked by the recently introduced xdmac. It causes an error when
      doing the slave configuration and so prevents from using dma.
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Cc: <stable@vger.kernel.org> # 3.12 and later
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      a8d4e016
    • Michal Simek's avatar
      serial: of-serial: Remove device_type = "serial" registration · 6befa9d8
      Michal Simek authored
      Do not probe all serial drivers by of_serial.c which are using
      device_type = "serial"; property. Only drivers which have valid
      compatible strings listed in the driver should be probed.
      
      When PORT_UNKNOWN is setup probe will fail anyway.
      
      Arnd quotation about driver historical background:
      "when I wrote that driver initially, the idea was that it would
      get used as a stub to hook up all other serial drivers but after
      that, the common code learned to create platform devices from DT"
      
      This patch fix the problem with on the system with xilinx_uartps and
      16550a where of_serial failed to register for xilinx_uartps and because
      of irq_dispose_mapping() removed irq_desc. Then when xilinx_uartps was asking
      for irq with request_irq() EINVAL is returned.
      Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
      CC: <stable@vger.kernel.org>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      6befa9d8