1. 24 9月, 2014 5 次提交
  2. 23 9月, 2014 1 次提交
  3. 22 9月, 2014 5 次提交
    • G
      Merge 3.17-rc6 into usb-next · 6ca01a1b
      Greg Kroah-Hartman 提交于
      We want the USB fixes in this branch as well.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      6ca01a1b
    • G
      Merge tag 'usb-serial-3.18-rc1' of... · 93177d1f
      Greg Kroah-Hartman 提交于
      Merge tag 'usb-serial-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
      
      Johan writes:
      
      USB-serial updates for v3.18-rc1
      
      These changes add two new "simple" drivers, while removing the redundant
      zte_ev driver (PIDs moved to option).
      
      Included are also some minor clean ups to the xsens_mt driver, and the
      enabling of further baud rates for pl2303 devices.
      Signed-off-by: NJohan Hovold <johan@kernel.org>
      93177d1f
    • L
      Linux 3.17-rc6 · 0f33be00
      Linus Torvalds 提交于
      0f33be00
    • L
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · dae0af78
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "Fixes for ARM, the most notable being the fix from Nathan Lynch to fix
        the state of various registers during execve, to ensure that data
        can't be leaked between two executables.
      
        Fixes from Victor Kamensky for get_user() on big endian platforms,
        since the addition of 8-byte get_user() support broke these fairly
        badly.
      
        A fix from Sudeep Holla for affinity setting when hotplugging CPU 0.
      
        A fix from Stephen Boyd for a perf-induced sleep attempt while atomic.
      
        Lastly, a correctness fix for emulation of the SWP instruction on
        ARMv7+, and a fix for wrong carry handling when updating the
        translation table base address on LPAE platforms"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8149/1: perf: Don't sleep while atomic when enabling per-cpu interrupts
        ARM: 8148/1: flush TLS and thumbee register state during exec
        ARM: 8151/1: add missing exports for asm functions required by get_user macro
        ARM: 8137/1: fix get_user BE behavior for target variable with size of 8 bytes
        ARM: 8135/1: Fix in-correct barrier usage in SWP{B} emulation
        ARM: 8133/1: use irq_set_affinity with force=false when migrating irqs
        ARM: 8132/1: LPAE: drop wrong carry flag correction after adding TTBR1_OFFSET
      dae0af78
    • L
      Merge tag 'media-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · c1f03b48
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "some media bug fixes:
         - a Kconfig dependency issue
         - some fixes for af9033/it913x demod to be more reliable and address
           a performance regression
         - cx18: fix an oops on devices with tda8290 tuner
         - two new USB IDs for af9035
         - a couple fixes on smapp driver"
      
      * tag 'media-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] af9035: new IDs: add support for PCTV 78e and PCTV 79e
        [media] af9033: feed clock to RF tuner
        [media] it913x: init tuner on attach
        [media] af9033: update IT9135 tuner inittabs
        [media] Kconfig: do not select SPI bus on sub-driver auto-select
        [media] cx18: fix kernel oops with tda8290 tuner
        [media] smiapp: Set sub-device owner
        [media] smiapp: Fix power count handling
      c1f03b48
  4. 21 9月, 2014 4 次提交
    • L
      Merge tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 3c2ea702
      Linus Torvalds 提交于
      Pull staging / IIO fixes from Greg KH:
       "Here are some IIO and Staging driver fixes for 3.17-rc6.  They are all
        pretty simple, and resolve reported issues"
      
      * tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: vt6655: buffer overflow in ioctl
        iio:magnetometer: bugfix magnetometers gain values
        iio: adc: at91: don't use the last converted data register
        iio: adc: xilinx-xadc: assign auxiliary channels address correctly
        iio: meter: ade7758: Fix indio_dev->trig assignment
        iio: inv_mpu6050: Fix indio_dev->trig assignment
        iio: gyro: itg3200: Fix indio_dev->trig assignment
        iio: st_sensors: Fix indio_dev->trig assignment
        iio: hid_sensor_hub: Fix indio_dev->trig assignment
        iio: adc: ad_sigma_delta: Fix indio_dev->trig assignment
        iio: accel: bma180: Fix indio_dev->trig assignment
        iio:trigger: modify return value for iio_trigger_get
        iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name
      3c2ea702
    • L
      Merge tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · c1fb79e2
      Linus Torvalds 提交于
      Pull USB fixes / quirks from Greg KH:
       "Here are some USB and PHY fixes and quirks for 3.17-rc6.  Nothing
        major, just a few things that have been reported"
      
      * tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters
        USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter
        USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter
        USB: EHCI: unlink QHs even after the controller has stopped
        phy: spear1340-miphy: fix driver dependencies
        phy: spear1310-miphy: fix driver dependencies
        phy: miphy365x: Fix off-by-one error
      c1fb79e2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 0d951433
      Linus Torvalds 提交于
      Pull SCSI target fixes from Nicholas Bellinger:
       "Here are the target pending fixes for v3.17-rc6.
      
        Included are Sagi's long overdue fixes related to iser-target
        shutdown, along with a couple of fixes from Sebastian related to ALUA
        Referrals changes that when in during the v3.14 time-frame.
      
        Also included are a few iscsi-target fixes, most recently of which
        where found during Joern's Coverity scanning of target code"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        iscsi-target: avoid NULL pointer in iscsi_copy_param_list failure
        iscsi-target: Fix memory corruption in iscsit_logout_post_handler_diffcid
        target: Fix inverted logic in SE_DEV_ALUA_SUPPORT_STATE_STORE
        target: Fix user data segment multiplier in spc_emulate_evpd_b3()
        iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup
        Target/iser: Fix initiator_depth and responder_resources
        Target/iser: Avoid calling rdma_disconnect twice
        Target/iser: Don't put isert_conn inside disconnected handler
        Target/iser: Get isert_conn reference once got to connected_handler
      0d951433
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 1734a6e4
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "A bunch of radeon fixes for oops on module unload, and problems with
        resetting the dma engine, one nouveau fix for black boxes in rendering
        on my mbp retina, one sti fix, and a couple of intel fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau: ltc/gf100-: fix cbc issues on certain boards
        drm/bochs: add missing drm_connector_register call
        drm/cirrus: add missing drm_connector_register call
        drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
        drm/nouveau/runpm: fix module unload
        drm/radeon/px: fix module unload
        vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
        drm/radeon: don't reset dma on r6xx-evergreen init
        drm/radeon: don't reset sdma on CIK init
        drm/radeon: don't reset dma on NI/SI init
        drm/radeon/dpm: fix resume on mullins
        drm/radeon: Disable HDP flush before every CS again for < r600
        drm/radeon: delete unused PTE_* defines
        drm/i915: Add limited color range readout for HDMI/DP ports on g4x/vlv/chv
        drm: sti: do not iterate over the info frame array
        drm/i915: Fix SRC_COPY width on 830/845g
      1734a6e4
  5. 20 9月, 2014 25 次提交