1. 24 9月, 2014 1 次提交
  2. 23 9月, 2014 19 次提交
    • L
      Revert "x86/efi: Fixup GOT in all boot code paths" · f3670394
      Linus Torvalds 提交于
      This reverts commit 9cb0e394.
      
      It causes my Sony Vaio Pro 11 to immediately reboot at startup.
      Acked-by: NIngo Molnar <mingo@kernel.org>
      Cc: Peter Anvin <hpa@zytor.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
      Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
      Cc: Matt Fleming <matt.fleming@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f3670394
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 98f75b82
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) If the user gives us a msg_namelen of 0, don't try to interpret
          anything pointed to by msg_name.  From Ani Sinha.
      
       2) Fix some bnx2i/bnx2fc randconfig compilation errors.
      
          The gist of the issue is that we firstly have drivers that span both
          SCSI and networking.  And at the top of that chain of dependencies
          we have things like SCSI_FC_ATTRS and SCSI_NETLINK which are
          selected.
      
          But since select is a sledgehammer and ignores dependencies,
          everything to select's SCSI_FC_ATTRS and/or SCSI_NETLINK has to also
          explicitly select their dependencies and so on and so forth.
      
          Generally speaking 'select' is supposed to only be used for child
          nodes, those which have no dependencies of their own.  And this
          whole chain of dependencies in the scsi layer violates that rather
          strongly.
      
          So just make SCSI_NETLINK depend upon it's dependencies, and so on
          and so forth for the things selecting it (either directly or
          indirectly).
      
          From Anish Bhatt and Randy Dunlap.
      
       3) Fix generation of blackhole routes in IPSEC, from Steffen Klassert.
      
       4) Actually notice netdev feature changes in rtl_open() code, from
          Hayes Wang.
      
       5) Fix divide by zero in bond enslaving, from Nikolay Aleksandrov.
      
       6) Missing memory barrier in sunvnet driver, from David Stevens.
      
       7) Don't leave anycast addresses around when ipv6 interface is
          destroyed, from Sabrina Dubroca.
      
       8) Don't call efx_{arch}_filter_sync_rx_mode before addr_list_lock is
          initialized in SFC driver, from Edward Cree.
      
       9) Fix missing DMA error checking in 3c59x, from Neal Horman.
      
      10) Openvswitch doesn't emit OVS_FLOW_CMD_NEW notifications accidently,
          fix from Samuel Gauthier.
      
      11) pch_gbe needs to select NET_PTP_CLASSIFY otherwise we can get a
          build error.
      
      12) Fix macvlan regression wherein we stopped emitting
          broadcast/multicast frames over software devices.  From Nicolas
          Dichtel.
      
      13) Fix infiniband bug due to unintended overflow of skb->cb[], from
          Eric Dumazet.  And add an assertion so this doesn't happen again.
      
      14) dm9000_parse_dt() should return error pointers, not NULL.  From
          Tobias Klauser.
      
      15) IP tunneling code uses this_cpu_ptr() in preemptible contexts, fix
          from Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (87 commits)
        net: bcmgenet: call bcmgenet_dma_teardown in bcmgenet_fini_dma
        net: bcmgenet: fix TX reclaim accounting for fragments
        ipv4: do not use this_cpu_ptr() in preemptible context
        dm9000: Return an ERR_PTR() in all error conditions of dm9000_parse_dt()
        r8169: fix an if condition
        r8152: disable ALDPS
        ipoib: validate struct ipoib_cb size
        net: sched: shrink struct qdisc_skb_cb to 28 bytes
        tg3: Work around HW/FW limitations with vlan encapsulated frames
        macvlan: allow to enqueue broadcast pkt on virtual device
        pch_gbe: 'select' NET_PTP_CLASSIFY.
        scsi: Use 'depends' with LIBFC instead of 'select'.
        openvswitch: restore OVS_FLOW_CMD_NEW notifications
        genetlink: add function genl_has_listeners()
        lib: rhashtable: remove second linux/log2.h inclusion
        net: allow macvlans to move to net namespace
        3c59x: Fix bad offset spec in skb_frag_dma_map
        3c59x: Add dma error checking and recovery
        sparc: bpf_jit: fix support for ldx/stx mem and SKF_AD_VLAN_TAG
        can: at91_can: add missing prepare and unprepare of the clock
        ...
      98f75b82
    • L
      Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux · 94783036
      Linus Torvalds 提交于
      Pull clock layer fixes from Mike Turquette:
       "The fixes for the clock tree are mostly run-time bugs in clock
        drivers.
      
        The fixes for TI DRA7 remove divide-by-zero errors.  The recently
        merged AT91 clock driver fixes some bad error checking and the QCOM
        driver fix restores audio for that platform, a clear regression.  A
        list iteration bug in the framework core was hit recently and is fixed
        up here.  Finally a compilation warning is fixed for efm32gg, which is
        also a regression fix"
      
      * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux:
        clk/efm32gg: fix dt init prototype
        clk: prevent erronous parsing of children during rate change
        clk: rockchip: Fix the clocks for i2c1 and i2c2
        clk: qcom: Fix sdc 144kHz frequency entry
        clk: at91: fix num_parents test in at91sam9260 slow clk implementation
        clk: ti: dra7-atl: Provide error check for incoming parameters in set_rate
        clk: ti: divider: Provide error check for incoming parameters in set_rate
      94783036
    • L
      Merge tag 'fscache-fixes-20140917' of... · e2519c2c
      Linus Torvalds 提交于
      Merge tag 'fscache-fixes-20140917' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
      
      Pull fs-cache fixes from David Howells:
      
       - Put a timeout in releasepage() to deal with a recursive hang between
         the memory allocator, writeback, ext4 and fscache under memory
         pressure.
      
       - Fix a pair of refcount bugs in the fscache error handling.
      
       - Remove a couple of unused pagevecs.
      
       - The cachefiles requirement that the base directory support rename
         should permit rename2 as an alternative - otherwise certain
         filesystems cannot now be used as backing stores (such as ext4).
      
      * tag 'fscache-fixes-20140917' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        CacheFiles: Handle rename2
        cachefiles: remove two unused pagevecs.
        FS-Cache: refcount becomes corrupt under vma pressure.
        FS-Cache: Reduce cookie ref count if submit fails.
        FS-Cache: Timeout for releasepage()
      e2519c2c
    • D
      Merge branch 'bcmgenet' · e18b7faa
      David S. Miller 提交于
      Florian Fainelli says:
      
      ====================
      net: bcmgenet: TX reclaim and DMA fixes
      
      This patch set contains one fix for an accounting problem while reclaiming
      transmitted buffers having fragments, and the second fix is to make sure
      that the DMA shutdown is properly controlled.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e18b7faa
    • F
      net: bcmgenet: call bcmgenet_dma_teardown in bcmgenet_fini_dma · 4a0c081e
      Florian Fainelli 提交于
      We should not be manipulaging the DMA_CTRL registers directly by writing
      0 to them to disable DMA. This is an operation that needs to be timed to
      make sure the DMA engines have been properly stopped since their state
      machine stops on a packet boundary, not immediately.
      
      Make sure that tha bcmgenet_fini_dma() calls bcmgenet_dma_teardown() to
      ensure a proper DMA engine state. As a result, we need to reorder the
      function bodies to resolve the use dependency.
      
      Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4a0c081e
    • F
      net: bcmgenet: fix TX reclaim accounting for fragments · 478a010c
      Florian Fainelli 提交于
      The GENET driver supports SKB fragments, and succeeds in transmitting
      them properly, but when reclaiming these transmitted fragments, we will
      only update the count of free buffer descriptors by 1, even for SKBs
      with fragments. This leads to the networking stack thinking it has more
      room than the hardware has when pushing new SKBs, and backing off
      consequently because we return NETDEV_TX_BUSY.
      
      Fix this by accounting for the SKB nr_frags plus one (itself) and update
      ring->free_bds accordingly with that value for each iteration loop in
      __bcmgenet_tx_reclaim().
      
      Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      478a010c
    • E
      ipv4: do not use this_cpu_ptr() in preemptible context · a35165ca
      Eric Dumazet 提交于
      this_cpu_ptr() in preemptible context is generally bad
      
      Sep 22 05:05:55 br kernel: [   94.608310] BUG: using smp_processor_id()
      in
      preemptible [00000000] code: ip/2261
      Sep 22 05:05:55 br kernel: [   94.608316] caller is
      tunnel_dst_set.isra.28+0x20/0x60 [ip_tunnel]
      Sep 22 05:05:55 br kernel: [   94.608319] CPU: 3 PID: 2261 Comm: ip Not
      tainted
      3.17.0-rc5 #82
      
      We can simply use raw_cpu_ptr(), as preemption is safe in these
      contexts.
      
      Should fix https://bugzilla.kernel.org/show_bug.cgi?id=84991Signed-off-by: NEric Dumazet <edumazet@google.com>
      Reported-by: NJoe <joe9mail@gmail.com>
      Fixes: 9a4aa9af ("ipv4: Use percpu Cache route in IP tunnels")
      Acked-by: NTom Herbert <therbert@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a35165ca
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec · 84de67b2
      David S. Miller 提交于
      Steffen Klassert says:
      
      ====================
      pull request (net): ipsec 2014-09-22
      
      We generate a blackhole or queueing route if a packet
      matches an IPsec policy but a state can't be resolved.
      Here we assume that dst_output() is called to kill
      these packets. Unfortunately this assumption is not
      true in all cases, so it is possible that these packets
      leave the system without the necessary transformations.
      
      This pull request contains two patches to fix this issue:
      
      1) Fix for blackhole routed packets.
      
      2) Fix for queue routed packets.
      
      Both patches are serious stable candidates.
      
      Please pull or let me know if there are problems.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      84de67b2
    • T
      dm9000: Return an ERR_PTR() in all error conditions of dm9000_parse_dt() · 09f3756b
      Tobias Klauser 提交于
      In one error condition dm9000_parse_dt() returns NULL, however the
      return value is checked using IS_ERR() in dm9000_probe(), leading to the
      error not being properly propagated if CONFIG_OF is not enabled or the
      device tree data is not available. Fix this by also returning an
      ERR_PTR() in this case.
      
      Fixes: 0b8bf1ba (net: dm9000: Allow instantiation using device tree)
      Signed-off-by: NTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      09f3756b
    • D
      r8169: fix an if condition · 85911d71
      Dan Carpenter 提交于
      There is an extra semi-colon so __rtl8169_set_features() is called every
      time.
      
      Fixes: 929a031d ('r8169: adjust __rtl8169_set_features')
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: Hayes Wang <hayeswang@realtek.com>--
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      85911d71
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · b0e2a55c
      Linus Torvalds 提交于
      Pull KVM fixes from Paolo Bonzini:
       "Two very simple bugfixes, affecting all supported architectures"
      
      [ Two? There's three commits in here.  Oh well, I guess Paolo didn't
        count the preparatory symbol export ]
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: correct null pid check in kvm_vcpu_yield_to()
        KVM: check for !is_zero_pfn() in kvm_is_mmio_pfn()
        mm: export symbol dependencies of is_zero_pfn()
      b0e2a55c
    • H
      r8152: disable ALDPS · d70b1137
      hayeswang 提交于
      If the hw is in ALDPS mode, the hw may have no response for accessing
      the most registers. Therefore, the ALDPS should be disabled before
      accessing the hw in rtl_ops.init(), rtl_ops.disable(), rtl_ops.up(),
      and rtl_ops.down(). Regardless of rtl_ops.enable(), because the hw
      wouldn't enter ALDPS mode when linking on. The hw would enter the
      ALDPS mode after several seconds when link down occurs and the ALDPS
      is enabled.
      Signed-off-by: NHayes Wang <hayeswang@realtek.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d70b1137
    • E
      ipoib: validate struct ipoib_cb size · b49fe362
      Eric Dumazet 提交于
      To catch future errors sooner.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b49fe362
    • E
      net: sched: shrink struct qdisc_skb_cb to 28 bytes · 25711786
      Eric Dumazet 提交于
      We cannot make struct qdisc_skb_cb bigger without impacting IPoIB,
      or increasing skb->cb[] size.
      
      Commit e0f31d84 ("flow_keys: Record IP layer protocol in
      skb_flow_dissect()") broke IPoIB.
      
      Only current offender is sch_choke, and this one do not need an
      absolutely precise flow key.
      
      If we store 17 bytes of flow key, its more than enough. (Its the actual
      size of flow_keys if it was a packed structure, but we might add new
      fields at the end of it later)
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Fixes: e0f31d84 ("flow_keys: Record IP layer protocol in skb_flow_dissect()")
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      25711786
    • V
      tg3: Work around HW/FW limitations with vlan encapsulated frames · 476c1885
      Vlad Yasevich 提交于
      TG3 appears to have an issue performing TSO and checksum offloading
      correclty when the frame has been vlan encapsulated (non-accelrated).
      In these cases, tcp checksum is not correctly updated.
      
      This patch attempts to work around this issue.  After the patch,
      802.1ad vlans start working correctly over tg3 devices.
      
      CC: Prashant Sreedharan <prashant@broadcom.com>
      CC: Michael Chan <mchan@broadcom.com>
      Signed-off-by: NVladislav Yasevich <vyasevic@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      476c1885
    • N
      macvlan: allow to enqueue broadcast pkt on virtual device · 07d92d5c
      Nicolas Dichtel 提交于
      Since commit 412ca155 ("macvlan: Move broadcasts into a work queue"), the
      driver uses tx_queue_len of the master device as the limit of packets enqueuing.
      Problem is that virtual drivers have this value set to 0, thus all broadcast
      packets were rejected.
      Because tx_queue_len was arbitrarily chosen, I replace it with a static limit
      of 1000 (also arbitrarily chosen).
      
      CC: Herbert Xu <herbert@gondor.apana.org.au>
      Reported-by: NThibaut Collet <thibaut.collet@6wind.com>
      Suggested-by: NThibaut Collet <thibaut.collet@6wind.com>
      Tested-by: NThibaut Collet <thibaut.collet@6wind.com>
      Signed-off-by: NNicolas Dichtel <nicolas.dichtel@6wind.com>
      Acked-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      07d92d5c
    • D
      pch_gbe: 'select' NET_PTP_CLASSIFY. · 4e5f9ef3
      David S. Miller 提交于
      Fixes the following randconfig build failure:
      
      > drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c: In function
      > ‘pch_ptp_match’:
      > drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c:130:2: error:
      > implicit declaration of function ‘ptp_classify_raw’
      > [-Werror=implicit-function-declaration]
      >   if (ptp_classify_raw(skb) == PTP_CLASS_NONE)
      >   ^
      > cc1: some warnings being treated as errors
      > make[5]: *** [drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.o] Error 1
      Reported-by: NJim Davis <jim.epost@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4e5f9ef3
    • D
      scsi: Use 'depends' with LIBFC instead of 'select'. · df568d8e
      David S. Miller 提交于
      LIBFC depends upon SCSI_FC_ATTRS and select's CRC32C.
      
      The only alternative would be to 'select' CRC32C and all of
      SCSI_FC_ATTRS direct and indirect dependencies in the Kconfig section
      for every LIBFCOE user which makes little sense.
      
      Subsequently, use 'depends' instead of 'select' for LIBFCOE too.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      df568d8e
  3. 22 9月, 2014 6 次提交
    • L
      Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 7c9a3730
      Linus Torvalds 提交于
      Pull workqueue fix from Tejun Heo:
       "create_singlethread_workqueue() is the old interface which is kept
        around for backward compatibility - each should be reviewed to
        determine whether singlethread usage was to save worker threads or for
        ordering guarantee and whether it's depended upon by memory reclaim
        path.
      
        While adding NUMA support for unbound workqueues during v3.10, I
        forgot to update it breaking the singlethread and ordering properties
        on NUMA setups.  The breakage was unfortunately rather subtle and went
        without being reported until now.
      
        The only missing piece is __WQ_ORDERED flag which makes the unbounded
        workqueue use a single backend queue across different NUMA nodes.
        It's fixed by making create_singlethread_workqueue() wrap
        alloc_ordered_workqueue() so that possible future updates are
        inherited automatically"
      
      * 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()
      7c9a3730
    • A
      Fix nasty 32-bit overflow bug in buffer i/o code. · f2d5a944
      Anton Altaparmakov 提交于
      On 32-bit architectures, the legacy buffer_head functions are not always
      handling the sector number with the proper 64-bit types, and will thus
      fail on 4TB+ disks.
      
      Any code that uses __getblk() (and thus bread(), breadahead(),
      sb_bread(), sb_breadahead(), sb_getblk()), and calls it using a 64-bit
      block on a 32-bit arch (where "long" is 32-bit) causes an inifinite loop
      in __getblk_slow() with an infinite stream of errors logged to dmesg
      like this:
      
        __find_get_block_slow() failed. block=6740375944, b_blocknr=2445408648
        b_state=0x00000020, b_size=512
        device sda1 blocksize: 512
      
      Note how in hex block is 0x191C1F988 and b_blocknr is 0x91C1F988 i.e. the
      top 32-bits are missing (in this case the 0x1 at the top).
      
      This is because grow_dev_page() is broken and has a 32-bit overflow due
      to shifting the page index value (a pgoff_t - which is just 32 bits on
      32-bit architectures) left-shifted as the block number.  But the top
      bits to get lost as the pgoff_t is not type cast to sector_t / 64-bit
      before the shift.
      
      This patch fixes this issue by type casting "index" to sector_t before
      doing the left shift.
      
      Note this is not a theoretical bug but has been seen in the field on a
      4TiB hard drive with logical sector size 512 bytes.
      
      This patch has been verified to fix the infinite loop problem on 3.17-rc5
      kernel using a 4TB disk image mounted using "-o loop".  Without this patch
      doing a "find /nt" where /nt is an NTFS volume causes the inifinite loop
      100% reproducibly whilst with the patch it works fine as expected.
      Signed-off-by: NAnton Altaparmakov <aia21@cantab.net>
      Cc: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f2d5a944
    • S
      KVM: correct null pid check in kvm_vcpu_yield_to() · 27fbe64b
      Sam Bobroff 提交于
      Correct a simple mistake of checking the wrong variable
      before a dereference, resulting in the dereference not being
      properly protected by rcu_dereference().
      Signed-off-by: NSam Bobroff <sam.bobroff@au1.ibm.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      27fbe64b
    • 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 10 次提交