1. 26 Sep, 2013 26 commits
  2. 23 Sep, 2013 5 commits
    • Greg Kroah-Hartman's avatar
      Revert "Revert "USB: EHCI: support running URB giveback in tasklet context"" · c04ee4b1
      Greg Kroah-Hartman authored
      This reverts commit 3b8d7321, which
      brings back commit 428aac8a as it should
      be working for the 3.13-rc1 merge window now that Alan's other fixes are
      here in the tree already.
      
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: Ming Lei <ming.lei@canonical.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      c04ee4b1
    • Greg Kroah-Hartman's avatar
      Merge branch 'master' into usb-next · dc4fea79
      Greg Kroah-Hartman authored
      We have USB fixes now in Linus's tree that we need to properly sort out
      with reverts and the like in the usb-next branch, so merge them together
      and do it by hand.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      dc4fea79
    • Linus Torvalds's avatar
      Merge tag 'staging-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 9d23108d
      Linus Torvalds authored
      Pull staging fixes from Greg KH:
       "Here are a number of small staging tree and iio driver fixes.  Nothing
        major, just lots of little things"
      
      * tag 'staging-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (34 commits)
        iio:buffer_cb: Add missing iio_buffer_init()
        iio: Prevent race between IIO chardev opening and IIO device free
        iio: fix: Keep a reference to the IIO device for open file descriptors
        iio: Stop sampling when the device is removed
        iio: Fix crash when scan_bytes is computed with active_scan_mask == NULL
        iio: Fix mcp4725 dev-to-indio_dev conversion in suspend/resume
        iio: Fix bma180 dev-to-indio_dev conversion in suspend/resume
        iio: Fix tmp006 dev-to-indio_dev conversion in suspend/resume
        iio: iio_device_add_event_sysfs() bugfix
        staging: iio: ade7854-spi: Fix return value
        staging:iio:hmc5843: Fix measurement conversion
        iio: isl29018: Fix uninitialized value
        staging:iio:dummy fix kfifo_buf kconfig dependency issue if kfifo modular and buffer enabled for built in dummy driver.
        iio: at91: fix adc_clk overflow
        staging: line6: add bounds check in snd_toneport_source_put()
        Staging: comedi: Fix dependencies for drivers misclassified as PCI
        staging: r8188eu: Adjust RX gain
        staging: r8188eu: Fix smatch warning in core/rtw_ieee80211.
        staging: r8188eu: Fix smatch error in core/rtw_mlme_ext.c
        staging: r8188eu: Fix Smatch off-by-one warning in hal/rtl8188e_hal_init.c
        ...
      9d23108d
    • Linus Torvalds's avatar
      Merge tag 'usb-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · e04a0a5a
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a number of small USB fixes for 3.12-rc2.
      
        One is a revert of a EHCI change that isn't quite ready for 3.12.
        Others are minor things, gadget fixes, Kconfig fixes, and some quirks
        and documentation updates.
      
        All have been in linux-next for a bit"
      
      * tag 'usb-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: pl2303: distinguish between original and cloned HX chips
        USB: Faraday fotg210: fix email addresses
        USB: fix typo in usb serial simple driver Kconfig
        Revert "USB: EHCI: support running URB giveback in tasklet context"
        usb: s3c-hsotg: do not disconnect gadget when receiving ErlySusp intr
        usb: s3c-hsotg: fix unregistration function
        usb: gadget: f_mass_storage: reset endpoint driver data when disabled
        usb: host: fsl-mph-dr-of: Staticize local symbols
        usb: gadget: f_eem: Staticize eem_alloc
        usb: gadget: f_ecm: Staticize ecm_alloc
        usb: phy: omap-usb3: Fix return value
        usb: dwc3: gadget: avoid memory leak when failing to allocate all eps
        usb: dwc3: remove extcon dependency
        usb: gadget: add '__ref' for rndis_config_register() and cdc_config_register()
        usb: dwc3: pci: add support for BayTrail
        usb: gadget: cdc2: fix conversion to new interface of f_ecm
        usb: gadget: fix a bug and a WARN_ON in dummy-hcd
        usb: gadget: mv_u3d_core: fix violation of locking discipline in mv_u3d_ep_disable()
      e04a0a5a
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · d8524ae9
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       - some small fixes for msm and exynos
       - a regression revert affecting nouveau users with old userspace
       - intel pageflip deadlock and gpu hang fixes, hsw modesetting hangs
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (22 commits)
        Revert "drm: mark context support as a legacy subsystem"
        drm/i915: Don't enable the cursor on a disable pipe
        drm/i915: do not update cursor in crtc mode set
        drm/exynos: fix return value check in lowlevel_buffer_allocate()
        drm/exynos: Fix address space warnings in exynos_drm_fbdev.c
        drm/exynos: Fix address space warning in exynos_drm_buf.c
        drm/exynos: Remove redundant OF dependency
        drm/msm: drop unnecessary set_need_resched()
        drm/i915: kill set_need_resched
        drm/msm: fix potential NULL pointer dereference
        drm/i915/dvo: set crtc timings again for panel fixed modes
        drm/i915/sdvo: Robustify the dtd<->drm_mode conversions
        drm/msm: workaround for missing irq
        drm/msm: return -EBUSY if bo still active
        drm/msm: fix return value check in ERR_PTR()
        drm/msm: fix cmdstream size check
        drm/msm: hangcheck harder
        drm/msm: handle read vs write fences
        drm/i915/sdvo: Fully translate sync flags in the dtd->mode conversion
        drm/i915: Use proper print format for debug prints
        ...
      d8524ae9
  3. 22 Sep, 2013 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block · 68cf8d0c
      Linus Torvalds authored
      Pull block IO fixes from Jens Axboe:
       "After merge window, no new stuff this time only a collection of neatly
        confined and simple fixes"
      
      * 'for-3.12/core' of git://git.kernel.dk/linux-block:
        cfq: explicitly use 64bit divide operation for 64bit arguments
        block: Add nr_bios to block_rq_remap tracepoint
        If the queue is dying then we only call the rq->end_io callout. This leaves bios setup on the request, because the caller assumes when the blk_execute_rq_nowait/blk_execute_rq call has completed that the rq->bios have been cleaned up.
        bio-integrity: Fix use of bs->bio_integrity_pool after free
        blkcg: relocate root_blkg setting and clearing
        block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
        block: trace all devices plug operation
      68cf8d0c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 0fbf2cc9
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "These are mostly bug fixes and a two small performance fixes.  The
        most important of the bunch are Josef's fix for a snapshotting
        regression and Mark's update to fix compile problems on arm"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (25 commits)
        Btrfs: create the uuid tree on remount rw
        btrfs: change extent-same to copy entire argument struct
        Btrfs: dir_inode_operations should use btrfs_update_time also
        btrfs: Add btrfs: prefix to kernel log output
        btrfs: refuse to remount read-write after abort
        Btrfs: btrfs_ioctl_default_subvol: Revert back to toplevel subvolume when arg is 0
        Btrfs: don't leak transaction in btrfs_sync_file()
        Btrfs: add the missing mutex unlock in write_all_supers()
        Btrfs: iput inode on allocation failure
        Btrfs: remove space_info->reservation_progress
        Btrfs: kill delay_iput arg to the wait_ordered functions
        Btrfs: fix worst case calculator for space usage
        Revert "Btrfs: rework the overcommit logic to be based on the total size"
        Btrfs: improve replacing nocow extents
        Btrfs: drop dir i_size when adding new names on replay
        Btrfs: replay dir_index items before other items
        Btrfs: check roots last log commit when checking if an inode has been logged
        Btrfs: actually log directory we are fsync()'ing
        Btrfs: actually limit the size of delalloc range
        Btrfs: allocate the free space by the existed max extent size when ENOSPC
        ...
      0fbf2cc9
    • Anatol Pomozov's avatar
      cfq: explicitly use 64bit divide operation for 64bit arguments · f3cff25f
      Anatol Pomozov authored
      'samples' is 64bit operant, but do_div() second parameter is 32.
      do_div silently truncates high 32 bits and calculated result
      is invalid.
      
      In case if low 32bit of 'samples' are zeros then do_div() produces
      kernel crash.
      Signed-off-by: default avatarAnatol Pomozov <anatol.pomozov@gmail.com>
      Acked-by: default avatarTejun Heo <tj@kernel.org>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      f3cff25f
  4. 21 Sep, 2013 6 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-fixes-for-3.12a' of... · 61740810
      Greg Kroah-Hartman authored
      Merge tag 'iio-fixes-for-3.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      First round of IIO fixes for 3.12
      
      A series of wrong 'struct dev' assumptions in suspend/resume callbacks
      following on from this issue being identified in a new driver review.
      One to watch out for in future.
      
      A number of driver specific fixes
      1) at91 - fix a overflow in clock rate computation
      2) dummy - Kconfig dependency issue
      3) isl29018 - uninitialized value
      4) hmc5843 - measurement conversion bug introduced by recent cleanup.
      5) ade7854-spi - wrong return value.
      
      Some IIO core fixes
      1) Wrong value picked up for event code creation for a modified channel
      2) A null dereference on failure to initialize a buffer after no buffer has
         been in use, when using the available_scan_masks approach.
      3) Sampling not stopped when a device is removed. Effects forced removal
         such as hot unplugging.
      4) Prevent device going away if a chrdev is still open in userspace.
      5) Prevent race on chardev opening and device being freed.
      6) Add a missing iio_buffer_init in the call back buffer.
      
      These last few are the first part of a set from Lars-Peter Clausen who
      has been taking a closer look at our removal paths and buffer handling
      than anyone has for quite some time.
      61740810
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.12-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · c43a3855
      Linus Torvalds authored
      Pull NFS client bugfix from Trond Myklebust:
       "Fix a regression due to incorrect sharing of gss auth caches"
      
      * tag 'nfs-for-3.12-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        RPCSEC_GSS: fix crash on destroying gss auth
      c43a3855
    • Jun'ichi Nomura's avatar
      block: Add nr_bios to block_rq_remap tracepoint · 75afb352
      Jun'ichi Nomura authored
      Adding the number of bios in a remapped request to 'block_rq_remap'
      tracepoint.
      
      Request remapper clones bios in a request to track the completion
      status of each bio. So the number of bios can be useful information
      for investigation.
      
      Related discussions:
        http://www.redhat.com/archives/dm-devel/2013-August/msg00084.html
        http://www.redhat.com/archives/dm-devel/2013-September/msg00024.htmlSigned-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
      Acked-by: default avatarMike Snitzer <snitzer@redhat.com>
      Cc: Jens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      75afb352
    • Josef Bacik's avatar
      Btrfs: create the uuid tree on remount rw · 94aebfb2
      Josef Bacik authored
      Users have been complaining of the uuid tree stuff warning that there is no uuid
      root when trying to do snapshot operations.  This is because if you mount -o ro
      we will not create the uuid tree.  But then if you mount -o rw,remount we will
      still not create it and then any subsequent snapshot/subvol operations you try
      to do will fail gloriously.  Fix this by creating the uuid_root on remount rw if
      it was not already there.  Thanks,
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      94aebfb2
    • Mark Fasheh's avatar
      btrfs: change extent-same to copy entire argument struct · cbf8b8ca
      Mark Fasheh authored
      btrfs_ioctl_file_extent_same() uses __put_user_unaligned() to copy some data
      back to it's argument struct. Unfortunately, not all architectures provide
      __put_user_unaligned(), so compiles break on them if btrfs is selected.
      
      Instead, just copy the whole struct in / out at the start and end of
      operations, respectively.
      Signed-off-by: default avatarMark Fasheh <mfasheh@suse.de>
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      cbf8b8ca
    • Guangyu Sun's avatar
      Btrfs: dir_inode_operations should use btrfs_update_time also · 93fd63c2
      Guangyu Sun authored
      Commit 2bc55652 (Btrfs: don't update atime on
      RO subvolumes) ensures that the access time of an inode is not updated when
      the inode lives in a read-only subvolume.
      However, if a directory on a read-only subvolume is accessed, the atime is
      updated. This results in a write operation to a read-only subvolume. I
      believe that access times should never be updated on read-only subvolumes.
      
      To reproduce:
      
       # mkfs.btrfs -f /dev/dm-3
       (...)
       # mount /dev/dm-3 /mnt
       # btrfs subvol create /mnt/sub
       	Create subvolume '/mnt/sub'
       # mkdir /mnt/sub/dir
       # echo "abc" > /mnt/sub/dir/file
       # btrfs subvol snapshot -r /mnt/sub /mnt/rosnap
       	Create a readonly snapshot of '/mnt/sub' in '/mnt/rosnap'
       # stat /mnt/rosnap/dir
       	File: `/mnt/rosnap/dir'
       	Size: 8         Blocks: 0          IO Block: 4096   directory
       Device: 16h/22d    Inode: 257         Links: 1
       Access: (0755/drwxr-xr-x)  Uid: (    0/    root)   Gid: (    0/    root)
       	Access: 2013-09-11 07:21:49.389157126 -0400
       	Modify: 2013-09-11 07:22:02.330156079 -0400
       	Change: 2013-09-11 07:22:02.330156079 -0400
       # ls /mnt/rosnap/dir
       	file
       # stat /mnt/rosnap/dir
       	File: `/mnt/rosnap/dir'
       	Size: 8         Blocks: 0          IO Block: 4096   directory
       Device: 16h/22d    Inode: 257         Links: 1
       Access: (0755/drwxr-xr-x)  Uid: (    0/    root)   Gid: (    0/    root)
       	Access: 2013-09-11 07:22:56.797151670 -0400
       	Modify: 2013-09-11 07:22:02.330156079 -0400
       	Change: 2013-09-11 07:22:02.330156079 -0400
      Reported-by: default avatarKoen De Wit <koen.de.wit@oracle.com>
      Signed-off-by: default avatarGuangyu Sun <guangyu.sun@oracle.com>
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      93fd63c2