1. 16 2月, 2014 4 次提交
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3a19c07c
      Linus Torvalds 提交于
      Pull timer fixes from Thomas Gleixner:
       "The following trilogy of patches brings you:
      
         - fix for a long standing math overflow issue with HZ < 60
      
         - an onliner fix for a corner case in the dreaded tick broadcast
           mechanism affecting a certain range of AMD machines which are
           infested with the infamous automagic C1E power control misfeature
      
         - a fix for one of the ARM platforms which allows the kernel to
           proceed and boot instead of stupidly panicing for no good reason.
           The patch is slightly larger than necessary, but it's less ugly
           than the alternative 5 liner"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tick: Clear broadcast pending bit when switching to oneshot
        clocksource: Kona: Print warning rather than panic
        time: Fix overflow when HZ is smaller than 60
      3a19c07c
    • L
      Merge tag 'trace-fixes-v3.14-rc2' of... · 9bd01b9b
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull twi tracing fixes from Steven Rostedt:
       "Two urgent fixes in the tracing utility.
      
        The first is a fix for the way the ring buffer stores timestamps.
        After a restructure of the code was done, the ring buffer timestamp
        logic missed the fact that the first event on a sub buffer is to have
        a zero delta, as the full timestamp is stored on the sub buffer
        itself.  But because the delta was not cleared to zero, the timestamp
        for that event will be calculated as the real timestamp + the delta
        from the last timestamp.  This can skew the timestamps of the events
        and have them say they happened when they didn't really happen.
        That's bad.
      
        The second fix is for modifying the function graph caller site.  When
        the stop machine was removed from updating the function tracing code,
        it missed updating the function graph call site location.  It is still
        modified as if it is being done via stop machine.  But it's not.  This
        can lead to a GPF and kernel crash if the function graph call site
        happens to lie between cache lines and one CPU is executing it while
        another CPU is doing the update.  It would be a very hard condition to
        hit, but the result is severe enough to have it fixed ASAP"
      
      * tag 'trace-fixes-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace/x86: Use breakpoints for converting function graph caller
        ring-buffer: Fix first commit on sub-buffer having non-zero delta
      9bd01b9b
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7fc92804
      Linus Torvalds 提交于
      Pull x86 EFI fixes from Peter Anvin:
       "A few more EFI-related fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/efi: Check status field to validate BGRT header
        x86/efi: Fix 32-bit fallout
      7fc92804
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 83660b73
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Kevin Hilman:
       "A collection of ARM SoC fixes for v3.14-rc1.
      
        Mostly a collection of Kconfig, device tree data and compilation fixes
        along with fix to drivers/phy that fixes a boot regression on some
        Marvell mvebu platforms"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        dma: mv_xor: Silence a bunch of LPAE-related warnings
        ARM: ux500: disable msp2 device tree node
        ARM: zynq: Reserve not DMAable space in front of the kernel
        ARM: multi_v7_defconfig: Select CONFIG_SOC_DRA7XX
        ARM: imx6: Initialize low-power mode early again
        ARM: pxa: fix various compilation problems
        ARM: pxa: fix compilation problem on AM300EPD board
        ARM: at91: add Atmel's SAMA5D3 Xplained board
        spi/atmel: document clock properties
        mmc: atmel-mci: document clock properties
        ARM: at91: enable USB host on at91sam9n12ek board
        ARM: at91/dt: fix sama5d3 ohci hclk clock reference
        ARM: at91/dt: sam9263: fix compatibility string for the I2C
        ata: sata_mv: Fix probe failures with optional phys
        drivers: phy: Add support for optional phys
        drivers: phy: Make NULL a valid phy reference
        ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
        ARM: moxart: move DMA_OF selection to driver
        ARM: hisi: fix kconfig warning on HAVE_ARM_TWD
      83660b73
  2. 15 2月, 2014 26 次提交
    • L
      Merge tag 'usb-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · ca033390
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here is a bunch of USB fixes for 3.14-rc3.  Most of these are xhci
        reverts, fixing a bunch of reported issues with USB 3 host controller
        issues that loads of people have been hitting (with the exception of
        kernel developers, all of our machines seem to be working fine, which
        is why these took so long to get resolved...)
      
        There are some other minor fixes and new device ids, as ususal.  All
        have been in linux-next successfully"
      
      * tag 'usb-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
        usb: option: blacklist ZTE MF667 net interface
        Revert "usb: xhci: Link TRB must not occur within a USB payload burst"
        Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"
        Revert "xhci: Set scatter-gather limit to avoid failed block writes."
        xhci 1.0: Limit arbitrarily-aligned scatter gather.
        Modpost: fixed USB alias generation for ranges including 0x9 and 0xA
        usb: core: Fix potential memory leak adding dyn USBdevice IDs
        USB: ftdi_sio: add Tagsys RFID Reader IDs
        usb: qcserial: add Netgear Aircard 340U
        usb-storage: enable multi-LUN scanning when needed
        USB: simple: add Dynastream ANT USB-m Stick device support
        usb-storage: add unusual-devs entry for BlackBerry 9000
        usb-storage: restrict bcdDevice range for Super Top in Cypress ATACB
        usb: phy: move some error messages to debug
        usb: ftdi_sio: add Mindstorms EV3 console adapter
        usb: dwc2: fix memory corruption in dwc2 driver
        usb: dwc2: fix role switch breakage
        usb: dwc2: bail out early when booting with "nousb"
        Revert "xhci: replace xhci_read_64() with readq()"
        Revert "xhci: replace xhci_write_64() with writeq()"
        ...
      ca033390
    • L
      Merge tag 'tty-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 40a215fb
      Linus Torvalds 提交于
      Pull tty/serial driver fixes from Greg KH:
       "Here are a small number of tty/serial driver fixes to resolve reported
        issues with 3.14-rc and earlier (in the case of the vt bugfix).  Some
        of these have been tested and reported by a number of people as the
        tty bugfix was pretty commonly hit on some platforms.
      
        All have been in linux-next for a while"
      
      * tag 'tty-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        vt: Fix secure clear screen
        serial: 8250: Support XR17V35x fraction divisor
        n_tty: Fix stale echo output
        serial: sirf: fix kernel panic caused by unpaired spinlock
        serial: 8250_pci: unbreak last serial ports on NetMos 9865 cards
        n_tty: Fix poll() when TIME_CHAR and MIN_CHAR == 0
        serial: omap: fix rs485 probe on defered pinctrl
        serial: 8250_dw: fix compilation warning when !CONFIG_PM_SLEEP
        serial: omap-serial: Move info message to probe function
        tty: Set correct tty name in 'active' sysfs attribute
        tty: n_gsm: Fix for modems with brk in modem status control
        drivers/tty/hvc: don't use module_init in non-modular hyp. console code
      40a215fb
    • L
      Merge tag 'staging-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · e2e481d6
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg KH:
       "Here are a number (lots, I know) of fixes for staging drivers to
        resolve a bunch of reported issues.
      
        The largest patches here is one revert of a patch that is in 3.14-rc1
        to fix reported problems, and a sync of a usb host driver that
        required some ARM patches to go in before it could be accepted (which
        is why it missed -rc1)
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'staging-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (56 commits)
        staging/rtl8821ae: fix build, depends on MAC80211
        iio: max1363: Use devm_regulator_get_optional for optional regulator
        iio:accel:bma180: Use modifier instead of index in channel specification
        iio: adis16400: Set timestamp as the last element in chan_spec
        iio: ak8975: Fix calculation formula for convert micro tesla to gauss unit
        staging:iio:ad799x fix typo in ad799x_events[]
        iio: mxs-lradc: remove useless scale_available files
        iio: mxs-lradc: fix buffer overflow
        iio:magnetometer:mag3110: Fix output of decimal digits in show_int_plus_micros()
        iio:magnetometer:mag3110: Report busy in _read_raw() / write_raw() when buffer is enabled
        wlags49_h2: Fix overflow in wireless_set_essid()
        xlr_net: Fix missing trivial allocation check
        staging: r8188eu: overflow in rtw_p2p_get_go_device_address()
        staging: r8188eu: array overflow in rtw_mp_ioctl_hdl()
        staging: r8188eu: Fix typo in USB_DEVICE list
        usbip/userspace/libsrc/names.c: memory leak
        gpu: ion: dereferencing an ERR_PTR
        staging: comedi: usbduxsigma: fix unaligned dereferences
        staging: comedi: fix too early cleanup in comedi_auto_config()
        staging: android: ion: dummy: fix an error code
        ...
      e2e481d6
    • L
      Merge tag 'driver-core-3.14-rc3' of... · ad07f124
      Linus Torvalds 提交于
      Merge tag 'driver-core-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fix from Greg KH:
       "Here is a single driver core patch for 3.14-rc3 for the component code
        that Russell has found and fixed"
      
      * tag 'driver-core-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        drivers/base: fix devres handling for master device
      ad07f124
    • L
      Merge tag 'char-misc-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · bb0a05d7
      Linus Torvalds 提交于
      Pull char/misc fixes from Greg KH:
       "Here are some small char/misc driver fixes, along with some
        documentation updates, for 3.14-rc3.  Nothing major, just a number of
        fixes for reported issues"
      
      * tag 'char-misc-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Revert "misc: eeprom: sunxi: Add new compatibles"
        Revert "ARM: sunxi: dt: Convert to the new SID compatibles"
        misc: mic: fix possible signed underflow (undefined behavior) in userspace API
        ARM: sunxi: dt: Convert to the new SID compatibles
        misc: eeprom: sunxi: Add new compatibles
        misc: genwqe: Fix potential memory leak when pinning memory
        Documentation:Update Documentation/zh_CN/arm64/memory.txt
        Documentation:Update Documentation/zh_CN/arm64/booting.txt
        Documentation:Chinese translation of Documentation/arm64/tagged-pointers.txt
        raw: set range for MAX_RAW_DEVS
        raw: test against runtime value of max_raw_minors
        Drivers: hv: vmbus: Don't timeout during the initial connection with host
        Drivers: hv: vmbus: Specify the target CPU that should receive notification
        VME: Correct read/write alignment algorithm
        mei: don't unset read cb ptr on reset
        mei: clear write cb from waiting list on reset
      bb0a05d7
    • L
      Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux · 8ba74517
      Linus Torvalds 提交于
      Pull two nfsd bugfixes from Bruce Fields.
      
      * 'for-3.14' of git://linux-nfs.org/~bfields/linux:
        lockd: send correct lock when granting a delayed lock.
        nfsd4: fix acl buffer overrun
      8ba74517
    • L
      Merge tag 'md/3.14-fixes' of git://neil.brown.name/md · bd3813d5
      Linus Torvalds 提交于
      Pull md fixes from Neil Brown:
       "Two bugfixes for md
      
        both tagged for -stable"
      
      * tag 'md/3.14-fixes' of git://neil.brown.name/md:
        md/raid5: Fix CPU hotplug callback registration
        md/raid1: restore ability for check and repair to fix read errors.
      bd3813d5
    • G
      Revert "misc: eeprom: sunxi: Add new compatibles" · bf747103
      Greg Kroah-Hartman 提交于
      This reverts commit f0de8e04, it is
      incorrect, a future patch will fix this up properly.
      
      Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      bf747103
    • G
      Revert "ARM: sunxi: dt: Convert to the new SID compatibles" · 8c442794
      Greg Kroah-Hartman 提交于
      This reverts commit 01ab1167, it is
      incorrect, a future patch will fix this up properly.
      
      Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      8c442794
    • H
      Merge remote-tracking branch 'efi/urgent' into x86/urgent · 31fce91e
      H. Peter Anvin 提交于
      There have been reports of EFI crashes since -rc1. The following two
      commits fix known issues.
      
       * Fix boot failure on 32-bit EFI due to the recent EFI memmap changes
         merged during the merge window - Borislav Petkov
      
       * Avoid a crash during efi_bgrt_init() by detecting invalid BGRT
         headers based on the 'status' field.
      Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      31fce91e
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · c1b8ae03
      Linus Torvalds 提交于
      Pull KVM fixes from Paolo Bonzini:
       "A small error handling problem and a compile breakage for ARM64"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        arm64: KVM: Add VGIC device control for arm64
        KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
      c1b8ae03
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 161aa772
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "A collection of small fixes:
      
         - There still seem to be problems with asm goto which requires the
           empty asm hack.
         - If SMAP is disabled at compile time, don't enable it nor try to
           interpret a page fault as an SMAP violation.
         - Fix a case of unbounded recursion while tracing"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off
        x86, smap: Don't enable SMAP if CONFIG_X86_SMAP is disabled
        compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
        x86: Use preempt_disable_notrace() in cycles_2_ns()
      161aa772
    • L
      Merge tag 'pm+acpi-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · eef445ee
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These include a fix for a recent intel_pstate regression, a fix for a
        regression in the ACPI-based PCI hotplug (ACPIPHP) code introduced
        during the 3.12 cycle, fixes for two bugs in the ACPI core introduced
        recently and a MAINTAINERS update related to cpufreq.
      
        Specifics:
      
         - Fix for a recent regression in the intel_pstate driver that
           introduced a race condition causing systems to crash during
           initialization in some situations.  This removes the affected code
           altogether.  From Dirk Brandewie.
      
         - ACPIPHP fix for a regression introduced during the 3.12 cycle
           causing devices to be dropped as a result of bus check
           notifications after system resume on some systems due to the way
           ACPIPHP interprets _STA return values (arguably incorrectly).  From
           Mika Westerberg.
      
         - ACPI dock driver fix for a problem causing docking to fail due to a
           check that always fails after recent ACPI core changes (found by
           code inspection).
      
         - ACPI container driver fix to prevent memory from being leaked in an
           error code path after device_register() failures.
      
         - Update of the arm_big_little cpufreq driver maintainer's e-mail
           address"
      
      * tag 'pm+acpi-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        MAINTAINERS / cpufreq: update Sudeep's email address
        intel_pstate: Remove energy reporting from pstate_sample tracepoint
        ACPI / container: Fix error code path in container_device_attach()
        ACPI / hotplug / PCI: Relax the checking of _STA return values
        ACPI / dock: Use acpi_device_enumerated() to check if dock is present
      eef445ee
    • L
      Merge tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 3bd354ab
      Linus Torvalds 提交于
      Pull EDAC fixes from Borislav Petkov:
       "Fix polling timeout setting through sysfs.
      
        You're surely wondering why the patches are not based on an rc.  Well,
        Andrew sent you 79040cad ("drivers/edac/edac_mc_sysfs.c: poll
        timeout cannot be zero sent you") already (it got in in -rc2) but it
        is not enough as a fix because for one, setting too low polling
        intervals (< 1sec) don't make any sense and cause unnecessary polling
        load on the system.
      
        Then, even if we set some interval, we explode with
      
          [ 4143.094342] WARNING: CPU: 1 PID: 0 at kernel/workqueue.c:1393 __queue_work+0x1d7/0x340()
      
        because the workqueue setup path is used also for the timeout period
        resetting and we're doing INIT_DELAYED_WORK() on an already active
        workqueue.  Which is total bollocks.  So this is taken care of by the
        second patch.
      
        I've CCed stable for those two"
      
      * tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC: Correct workqueue setup path
        EDAC: Poll timeout cannot be zero, p2
      3bd354ab
    • L
      Merge tag 'fbdev-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · cbc25256
      Linus Torvalds 提交于
      Pull fbdev fixes from Tomi Valkeinen:
       "Minor fbdev fixes for 3.14"
      
      * tag 'fbdev-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        video: Kconfig: Allow more broad selection of the imxfb framebuffer driver.
        video: exynos: Fix S6E8AX0 LCD driver build error
        OMAPDSS: fix fck field types
        OMAPDSS: DISPC: decimation rounding fix
      cbc25256
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 5e57dc81
      Linus Torvalds 提交于
      Pull block IO fixes from Jens Axboe:
       "Second round of updates and fixes for 3.14-rc2.  Most of this stuff
        has been queued up for a while.  The notable exception is the blk-mq
        changes, which are naturally a bit more in flux still.
      
        The pull request contains:
      
         - Two bug fixes for the new immutable vecs, causing crashes with raid
           or swap.  From Kent.
      
         - Various blk-mq tweaks and fixes from Christoph.  A fix for
           integrity bio's from Nic.
      
         - A few bcache fixes from Kent and Darrick Wong.
      
         - xen-blk{front,back} fixes from David Vrabel, Matt Rushton, Nicolas
           Swenson, and Roger Pau Monne.
      
         - Fix for a vec miscount with integrity vectors from Martin.
      
         - Minor annotations or fixes from Masanari Iida and Rashika Kheria.
      
         - Tweak to null_blk to do more normal FIFO processing of requests
           from Shlomo Pongratz.
      
         - Elevator switching bypass fix from Tejun.
      
         - Softlockup in blkdev_issue_discard() fix when !CONFIG_PREEMPT from
           me"
      
      * 'for-linus' of git://git.kernel.dk/linux-block: (31 commits)
        block: add cond_resched() to potentially long running ioctl discard loop
        xen-blkback: init persistent_purge_work work_struct
        blk-mq: pair blk_mq_start_request / blk_mq_requeue_request
        blk-mq: dont assume rq->errors is set when returning an error from ->queue_rq
        block: Fix cloning of discard/write same bios
        block: Fix type mismatch in ssize_t_blk_mq_tag_sysfs_show
        blk-mq: rework flush sequencing logic
        null_blk: use blk_complete_request and blk_mq_complete_request
        virtio_blk: use blk_mq_complete_request
        blk-mq: rework I/O completions
        fs: Add prototype declaration to appropriate header file include/linux/bio.h
        fs: Mark function as static in fs/bio-integrity.c
        block/null_blk: Fix completion processing from LIFO to FIFO
        block: Explicitly handle discard/write same segments
        block: Fix nr_vecs for inline integrity vectors
        blk-mq: Add bio_integrity setup to blk_mq_make_request
        blk-mq: initialize sg_reserved_size
        blk-mq: handle dma_drain_size
        blk-mq: divert __blk_put_request for MQ ops
        blk-mq: support at_head inserations for blk_execute_rq
        ...
      5e57dc81
    • L
      Merge tag 'sound-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0d25e369
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Again only fixes for HD-audio:
         - regression fixes due to the modularization
         - a few fixups for Dell, Sony and HP laptops
         - a revert of the previous fix as it leads to another regression"
      
      * tag 'sound-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: Revert "ALSA: hda/realtek - Avoid invalid COEFs for ALC271X"
        ALSA: hda - Fix undefined symbol due to builtin/module mixup
        ALSA: hda - Fix mic capture on Sony VAIO Pro 11
        ALSA: hda - Add a headset quirk for Dell XPS 13
        ALSA: hda - Fix inconsistent Mic mute LED
        ALSA: hda - Fix leftover ifdef checks after modularization
      0d25e369
    • L
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · e8478828
      Linus Torvalds 提交于
      Pull RDMA/InfiniBand fixes from Roland Dreier:
      
       - Fix some rough edges from the "IP addressing for IBoE" merge
      
       - Other misc fixes, mostly to hardware drivers
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (21 commits)
        RDMA/ocrdma: Fix load time panic during GID table init
        RDMA/ocrdma: Fix traffic class shift
        IB/iser: Fix use after free in iser_snd_completion()
        IB/iser: Avoid dereferencing iscsi_iser conn object when not bound to iser connection
        IB/usnic: Fix smatch endianness error
        IB/mlx5: Remove dependency on X86
        mlx5: Add include of <linux/slab.h> because of kzalloc()/kfree() use
        IB/qib: Add missing serdes init sequence
        RDMA/cxgb4: Add missing neigh_release in LE-Workaround path
        IB: Report using RoCE IP based gids in port caps
        IB/mlx4: Build the port IBoE GID table properly under bonding
        IB/mlx4: Do IBoE GID table resets per-port
        IB/mlx4: Do IBoE locking earlier when initializing the GID table
        IB/mlx4: Move rtnl locking to the right place
        IB/mlx4: Make sure GID index 0 is always occupied
        IB/mlx4: Don't allocate range of steerable UD QPs for Ethernet-only device
        RDMA/amso1100: Fix error return code
        RDMA/nes: Fix error return code
        IB/mlx5: Don't set "block multicast loopback" capability
        IB/mlx5: Fix binary compatibility with libmlx5
        ...
      e8478828
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 85643586
      Linus Torvalds 提交于
      Pull hwmon fix from Guenter Roeck:
       "Fix arithmetic overflow in ntc_thermistor driver"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (ntc_thermistor) Avoid math overflow
      85643586
    • L
      Merge tag 'for-v3.14-fixes' of git://git.infradead.org/battery-2.6 · 0a33d88d
      Linus Torvalds 提交于
      Pull battery fixes from Dmitry Eremin-Solenikov:
      
       - Fix NULL pointer dereference in max17040 driver
      
       - Add bq2415x dts bindings documentation
      
       - Fix misleading comment in ds2782 driver
      
       - Remove useless check in isp1704 charger driver.
      
      * tag 'for-v3.14-fixes' of git://git.infradead.org/battery-2.6:
        power: max17040: Fix NULL pointer dereference when there is no platform_data
        dt: binding documentation for bq2415x charger
        isp1704_charger: remove useless check in isp1704_charger_probe()
        power: ds2782_battery: Typo in comment
      0a33d88d
    • R
      Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes',... · c9459388
      Roland Dreier 提交于
      Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'usnic' into for-next
      c9459388
    • D
      RDMA/ocrdma: Fix load time panic during GID table init · 09de3f13
      Devesh Sharma 提交于
      We should use rdma_vlan_dev_real_dev() instead of using vlan_dev_real_dev()
      when building the GID table for a vlan interface.
      Signed-off-by: NDevesh Sharma <devesh.sharma@emulex.com>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      09de3f13
    • D
      RDMA/ocrdma: Fix traffic class shift · a61d93d9
      Devesh Sharma 提交于
      Use correct value for obtaining traffic class from device
      response for Query QP request.
      Signed-off-by: NDevesh Sharma <devesh.sharma@emulex.com>
      Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      a61d93d9
    • D
      IB/iser: Fix use after free in iser_snd_completion() · fd8b48b2
      Dan Carpenter 提交于
      We use "tx_desc" again after we free it.
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      fd8b48b2
    • R
      IB/iser: Avoid dereferencing iscsi_iser conn object when not bound to iser connection · 7d9eacf9
      Roi Dayan 提交于
      Fix a possible NULL pointer dereference in disconnection flow. This
      can happen if the target disconnected/rejected the connection request,
      e.g before the binding stage between iscsi connection to the transport
      connection.
      Signed-off-by: NAlex Tabachnik <alext@mellanox.com>
      Signed-off-by: NRoi Dayan <roid@mellanox.com>
      Signed-off-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      7d9eacf9
    • U
      IB/usnic: Fix smatch endianness error · f809309a
      Upinder Malhi 提交于
      Error reported at http://marc.info/?l=linux-rdma&m=138995755801039&w=2
      
      Fix short to int cast for big endian systems.
      Signed-off-by: NUpinder Malhi <umalhi@cisco.com>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      f809309a
  3. 14 2月, 2014 10 次提交