1. 25 Sep, 2013 21 commits
  2. 23 Sep, 2013 4 commits
    • Linus Torvalds's avatar
      Linux 3.12-rc2 · 4a10c2ac
      Linus Torvalds authored
      4a10c2ac
    • 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 7 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
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-3.13a' of... · 3ffdea3f
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-3.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      Jonathan writes:
      
      First round of new drivers, functionality and cleanups for IIO in the 3.13 cycle
      
      A number of new drivers and some new functionality + a lot of cleanups
      all over IIO.
      
      New Core Elements
      
      1) New INT_TIME info_mask element for integration time, which may have
         different effects on measurement noise and similar, than an amplifier
         and hence is different from existing SCALE.  Already existed in some
         drivers as a custom attribute.
      
      2) Introduce a iio_push_buffers_with_timestamp helper to cover the common
         case of filling the last 64 bits of data to be passed to the buffer with
         a timestamp.  Applied to lots of drivers. Cuts down on repeated code and
         moves a slightly fiddly bit of logic into a single location.
      
      3) Introduce info_mask_[shared_by_dir/shared_by_all] elements to allow support
         of elements such as sampling_frequency which is typically shared by all
         input channels on a device.  This reduces code and makes these controls
         available from in kernel consumers of IIO devices.
      
      New drivers
      
      1) MCP3422/3/4 ADC
      
      2) TSL4531 ambient light sensor
      
      3) TCS3472/5 color light sensor
      
      4) GP2AP020A00F ambient light / proximity sensor
      
      5) LPS001WP support added to ST pressure sensor driver.
      
      New driver functionality
      
      1) ti_am335x_adc Add buffered sampling support.
         This device has a hardware fifo that is fed directly into an IIO kfifo
         buffer based on a watershed interrupt.  Note this will act as an example
         of how to handle this increasingly common type of device.
         The only previous example - sca3000 - take a less than optimal approach
         which is largely why it is still in staging.
         A couple of little cleanups for that new functionality followed later.
      
      Core cleanups:
      
      1) MAINTAINERS - Sachin actually brought my email address up to date because
         I said I'd do it and never got around to it :)
      
      2) Assign buffer list elements as single element lists to simplify the
         iio_buffer_is_active logic.
      
      3) wake_up_interruptible_poll instead of wake_up_interruptible to only wake
         up threads waiting for poll notifications.
      
      4) Add O_CLOEXEC flag to anon_inode_get_fd call for IIO event interface.
      
      5) Change iio_push_to_buffers to take a void * pointer so as to avoid some
         annoying and unnecessary type casts.
      
      6) iio_compute_scan_bytes incorrectly took a long rather than unsigned long.
      
      7) Various minor tidy ups.
      
      Driver cleanups (in no particular order)
      
      1) Another set of devm_ allocations patches from Sachin Kamat.
      
      2) tsl2x7x - 0 to NULL cleanup.
      
      3) hmc5843 - fix missing > in MODULE_AUTHOR
      
      4) Set of strict_strto* to kstrto* conversions.
      
      5) mxs-lradc - fix ordering of resource removal to match creation
      
      6) mxs-lradc - add MODULE_ALIAS
      
      7) adc7606 - drop a work pending test duplicated in core functions.
      
      8) hmc5843 - devm_ allocation patch
      
      9) Series of redundant breaks removed.
      
      10) ad2s1200 - pr_err -> dev_err
      
      11) adjd_s311 - use INT_TIME
      
      12)  ST sensors - large set of cleanups from Lee Jones and removed restriction
          to using only triggers provided by the st_sensors themselves from
          Dennis Ciocca.
      
      13) dummy and tmp006 provide sampling_frequency via info_mask_shared_by_all.
      
      14) tcs3472 - fix incorrect buffer size and wrong device pointer used in
          suspend / resume functions.
      
      15) max1363 - use defaults for buffer setup ops as provided by the triggered
          buffer helpers as they are the same as were specified in max1363 driver.
      
      16) Trivial tidy ups in a number of other drivers.
      3ffdea3f
    • Zubair Lutfullah's avatar
      iio: ti_am335x_adc: cleanup error case · 074b6a8d
      Zubair Lutfullah authored
      Driver is functional without this error case. Cleaned up.
      Signed-off-by: default avatarZubair Lutfullah <zubair.lutfullah@gmail.com>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      074b6a8d
    • Zubair Lutfullah's avatar
      iio: ti_am335x_adc: cleanup trigger related code · a77d0209
      Zubair Lutfullah authored
      Trigger related headers and variables are not needed
      as driver is now based on INDIO_BUFFER_HARDWARE mode
      Signed-off-by: default avatarZubair Lutfullah <zubair.lutfullah@gmail.com>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      a77d0209
    • Zubair Lutfullah's avatar
      iio: ti_am335x_adc: fix static in function header · 98c08cf4
      Zubair Lutfullah authored
      Static is missing in function header. Corrected.
      Signed-off-by: default avatarZubair Lutfullah <zubair.lutfullah@gmail.com>
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      98c08cf4
  4. 21 Sep, 2013 8 commits