1. 02 Dec, 2014 8 commits
    • Petr Mladek's avatar
      drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6 · f5475cc4
      Petr Mladek authored
      I was unable too boot 3.18.0-rc6 because of the following kernel
      panic in drm_calc_vbltimestamp_from_scanoutpos():
      
          [drm] Initialized drm 1.1.0 20060810
          [drm] radeon kernel modesetting enabled.
          [drm] initializing kernel modesetting (RV100 0x1002:0x515E 0x15D9:0x8080).
          [drm] register mmio base: 0xC8400000
          [drm] register mmio size: 65536
          radeon 0000:0b:01.0: VRAM: 128M 0x00000000D0000000 - 0x00000000D7FFFFFF (16M used)
          radeon 0000:0b:01.0: GTT: 512M 0x00000000B0000000 - 0x00000000CFFFFFFF
          [drm] Detected VRAM RAM=128M, BAR=128M
          [drm] RAM width 16bits DDR
          [TTM] Zone  kernel: Available graphics memory: 3829346 kiB
          [TTM] Zone   dma32: Available graphics memory: 2097152 kiB
          [TTM] Initializing pool allocator
          [TTM] Initializing DMA pool allocator
          [drm] radeon: 16M of VRAM memory ready
          [drm] radeon: 512M of GTT memory ready.
          [drm] GART: num cpu pages 131072, num gpu pages 131072
          [drm] PCI GART of 512M enabled (table at 0x0000000037880000).
          radeon 0000:0b:01.0: WB disabled
          radeon 0000:0b:01.0: fence driver on ring 0 use gpu addr 0x00000000b0000000 and cpu addr 0xffff8800bbbfa000
          [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
          [drm] Driver supports precise vblank timestamp query.
          [drm] radeon: irq initialized.
          [drm] Loading R100 Microcode
          radeon 0000:0b:01.0: Direct firmware load for radeon/R100_cp.bin failed with error -2
          radeon_cp: Failed to load firmware "radeon/R100_cp.bin"
          [drm:r100_cp_init] *ERROR* Failed to load firmware!
          radeon 0000:0b:01.0: failed initializing CP (-2).
          radeon 0000:0b:01.0: Disabling GPU acceleration
          [drm] radeon: cp finalized
          BUG: unable to handle kernel NULL pointer dereference at 000000000000025c
          IP: [<ffffffff8150423b>] drm_calc_vbltimestamp_from_scanoutpos+0x4b/0x320
          PGD 0
          Oops: 0000 [#1] SMP
          Modules linked in:
          CPU: 1 PID: 1 Comm: swapper/0 Not tainted 3.18.0-rc6-4-default #2649
          Hardware name: Supermicro X7DB8/X7DB8, BIOS 6.00 07/26/2006
          task: ffff880234da2010 ti: ffff880234da4000 task.ti: ffff880234da4000
          RIP: 0010:[<ffffffff8150423b>]  [<ffffffff8150423b>] drm_calc_vbltimestamp_from_scanoutpos+0x4b/0x320
          RSP: 0000:ffff880234da7918  EFLAGS: 00010086
          RAX: ffffffff81557890 RBX: 0000000000000000 RCX: ffff880234da7a48
          RDX: ffff880234da79f4 RSI: 0000000000000000 RDI: ffff880232e15000
          RBP: ffff880234da79b8 R08: 0000000000000000 R09: 0000000000000000
          R10: 000000000000000a R11: 0000000000000001 R12: ffff880232dda1c0
          R13: ffff880232e1518c R14: 0000000000000292 R15: ffff880232e15000
          FS:  0000000000000000(0000) GS:ffff88023fc40000(0000) knlGS:0000000000000000
          CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
          CR2: 000000000000025c CR3: 0000000002014000 CR4: 00000000000007e0
          Stack:
           ffff880234da79d8 0000000000000286 ffff880232dcbc00 0000000000002480
           ffff880234da7958 0000000000000296 ffff880234da7998 ffffffff8151b51d
           ffff880234da7a48 0000000032dcbeb0 ffff880232dcbc00 ffff880232dcbc58
          Call Trace:
           [<ffffffff8151b51d>] ? drm_vma_offset_remove+0x1d/0x110
           [<ffffffff8152dc98>] radeon_get_vblank_timestamp_kms+0x38/0x60
           [<ffffffff8152076a>] ? ttm_bo_release_list+0xba/0x180
           [<ffffffff81503751>] drm_get_last_vbltimestamp+0x41/0x70
           [<ffffffff81503933>] vblank_disable_and_save+0x73/0x1d0
           [<ffffffff81106b2f>] ? try_to_del_timer_sync+0x4f/0x70
           [<ffffffff81505245>] drm_vblank_cleanup+0x65/0xa0
           [<ffffffff815604fa>] radeon_irq_kms_fini+0x1a/0x70
           [<ffffffff8156c07e>] r100_init+0x26e/0x410
           [<ffffffff8152ae3e>] radeon_device_init+0x7ae/0xb50
           [<ffffffff8152d57f>] radeon_driver_load_kms+0x8f/0x210
           [<ffffffff81506965>] drm_dev_register+0xb5/0x110
           [<ffffffff8150998f>] drm_get_pci_dev+0x8f/0x200
           [<ffffffff815291cd>] radeon_pci_probe+0xad/0xe0
           [<ffffffff8141a365>] local_pci_probe+0x45/0xa0
           [<ffffffff8141b741>] pci_device_probe+0xd1/0x130
           [<ffffffff81633dad>] driver_probe_device+0x12d/0x3e0
           [<ffffffff8163413b>] __driver_attach+0x9b/0xa0
           [<ffffffff816340a0>] ? __device_attach+0x40/0x40
           [<ffffffff81631cd3>] bus_for_each_dev+0x63/0xa0
           [<ffffffff8163378e>] driver_attach+0x1e/0x20
           [<ffffffff81633390>] bus_add_driver+0x180/0x240
           [<ffffffff81634914>] driver_register+0x64/0xf0
           [<ffffffff81419cac>] __pci_register_driver+0x4c/0x50
           [<ffffffff81509bf5>] drm_pci_init+0xf5/0x120
           [<ffffffff821dc871>] ? ttm_init+0x6a/0x6a
           [<ffffffff821dc908>] radeon_init+0x97/0xb5
           [<ffffffff810002fc>] do_one_initcall+0xbc/0x1f0
           [<ffffffff810e3278>] ? __wake_up+0x48/0x60
           [<ffffffff8218e256>] kernel_init_freeable+0x18a/0x215
           [<ffffffff8218d983>] ? initcall_blacklist+0xc0/0xc0
           [<ffffffff818a78f0>] ? rest_init+0x80/0x80
           [<ffffffff818a78fe>] kernel_init+0xe/0xf0
           [<ffffffff818c0c3c>] ret_from_fork+0x7c/0xb0
           [<ffffffff818a78f0>] ? rest_init+0x80/0x80
          Code: 45 ac 0f 88 a8 01 00 00 3b b7 d0 01 00 00 49 89 ff 0f 83 99 01 00 00 48 8b 47 20 48 8b 80 88 00 00 00 48 85 c0 0f 84 cd 01 00 00 <41> 8b b1 5c 02 00 00 41 8b 89 58 02 00 00 89 75 98 41 8b b1 60
          RIP  [<ffffffff8150423b>] drm_calc_vbltimestamp_from_scanoutpos+0x4b/0x320
           RSP <ffff880234da7918>
          CR2: 000000000000025c
          ---[ end trace ad2c0aadf48e2032 ]---
          Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000009
      
      It has helped me to add a NULL pointer check that was suggested at
      http://lists.freedesktop.org/archives/dri-devel/2014-October/070663.html
      
      I am not familiar with the code. But the change looks sane
      and we need something fast at this stage of 3.18 development.
      Suggested-by: default avatarHelge Deller <deller@gmx.de>
      Signed-off-by: default avatarPetr Mladek <pmladek@suse.cz>
      Tested-by: default avatarPetr Mladek <pmladek@suse.cz>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      f5475cc4
    • Michel Dänzer's avatar
    • Christian König's avatar
      drm/radeon: sync all BOs involved in a CS v2 · 86b27638
      Christian König authored
      Not just the userspace relocs, otherwise we won't wait
      for a swapped out page tables to be swapped in again.
      
      v2: rebased on Alex current drm-fixes-3.18
      Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      86b27638
    • Dave Airlie's avatar
      nouveau: move the hotplug ignore to correct place. · 8b62c8c6
      Dave Airlie authored
      Introduced in b440bde7, however it was added to
      the wrong function in nouveau.
      
      https://bugzilla.kernel.org/show_bug.cgi?id=86011
      Cc: Bjorn Helgaas <bhelgaas@google.com>
      CC: stable@vger.kernel.org  # v3.15+
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      8b62c8c6
    • Dave Airlie's avatar
      Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes · d87c0e3d
      Dave Airlie authored
      Just a couple of fixes for the fallout from the fence rework.
      
      * 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
        drm/nouveau/gf116: remove copy1 engine
        drm/nouveau: prevent stale fence->channel pointers, and protect with rcu
        drm/nouveau/fifo/g84-: ack non-stall interrupt before handling it
      d87c0e3d
    • Ilia Mirkin's avatar
      drm/nouveau/gf116: remove copy1 engine · 226d63a1
      Ilia Mirkin authored
      Indications are that no GF116's actually have a copy engine there, but
      actually have the decompression engine. This engine can be made to do
      copies, but that should be done separately.
      
      Unclear why this didn't turn up on all GF116's, but perhaps the
      non-mobile ones came with enough VRAM to not trigger ttm migrations in
      test scenarios.
      
      Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=85465
      Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59168
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      226d63a1
    • Maarten Lankhorst's avatar
    • Ben Skeggs's avatar
      drm/nouveau/fifo/g84-: ack non-stall interrupt before handling it · 19a10828
      Ben Skeggs authored
      Closes a very unlikely race that can occur if another NonStallInterrupt
      method passes between checking fences and acking the previous interrupt.
      
      With this change, the interrupt will re-fire under such conditions.
      Tested-by: default avatarTobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      19a10828
  2. 01 Dec, 2014 2 commits
  3. 30 Nov, 2014 1 commit
  4. 29 Nov, 2014 4 commits
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7a5a4f97
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "Three fixlets from the ARM SoC camp:
         - correct irqdomain initialization for atmel-aic
         - correct error handling for device tree parsing in bcm controllers"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: brcmstb-l2: Fix error handling of irq_of_parse_and_map
        irqchip: bcm7120-l2: Fix error handling of irq_of_parse_and_map
        irqchip: atmel-aic: Fix irqdomain initialization
      7a5a4f97
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · ed02bfa4
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a set of ten fixes: 8 for UFS including four static checker
        warnings, a potential null deref in the voltage regulator code, a race
        on module unload, a ref counting fix on the well known LUNs which made
        it impossible to remove the ufs module and fix to correct the
        information in pwr_info.
      
        In addition to UFS, there's a blacklist for the Intel Multi-Flex array
        which chokes on report supported operation codes and a fix to an oops
        in bnx2fc caused by shared skbs"
      
      [ For us non-SCSI people: "UFS" here is "Universal Flash Storage" not
        the filesystem.  - Linus ]
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        ufs: fix NULL dereference when no regulators are defined
        ufs: ensure clk gating work is finished before module unloading
        scsi: ufs: fix static checker warning in ufshcd_parse_clock_info
        scsi: ufs: fix static checker warning in __ufshcd_setup_clocks
        scsi: ufs: fix static checker warning in ufshcd_populate_vreg
        scsi: ufs: fix static checker errors in ufshcd_system_suspend
        ufs: fix power info after link start-up
        ufs: fix reference counting of W-LUs
        scsi: add Intel Multi-Flex to scsi scan blacklist
        bnx2fc: do not add shared skbs to the fcoe_rx_list
      ed02bfa4
    • Linus Torvalds's avatar
      Merge tag 'staging-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 88910638
      Linus Torvalds authored
      Pull staging/IIO driver fixes from Greg KH:
       "Here are some staging and IIO driver fixes for 3.18-rc7 that resolve a
        number of reported issues, and a new device id for a staging wireless
        driver.
      
        All of these have been in linux-next"
      
      * tag 'staging-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: r8188eu: Add new device ID for DLink GO-USB-N150
        staging: r8188eu: Fix scheduling while atomic error introduced in commit fadbe0cd
        iio: accel: bmc150: set low default thresholds
        iio: accel: bmc150: Fix iio_event_spec direction
        iio: accel: bmc150: Send x, y and z motion separately
        iio: accel: bmc150: Error handling when mode set fails
        iio: gyro: bmg160: Fix iio_event_spec direction
        iio: gyro: bmg160: Send x, y and z motion separately
        iio: gyro: bmg160: Don't let interrupt mode to be open drain
        iio: gyro: bmg160: Error handling when mode set fails
        iio: adc: men_z188_adc: Add terminating entry for men_z188_ids
        iio: accel: kxcjk-1013: Fix kxcjk10013_set_range
        iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask
      88910638
    • Linus Torvalds's avatar
      Merge tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 6f93840d
      Linus Torvalds authored
      Pull tty/serial fix from Greg KH:
       "Here is a single revert for the of-serial driver that resolves a
        reported issue.
      
        This revert has been in linux-next for a while"
      
      * tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "serial: of-serial: add PM suspend/resume support"
      6f93840d
  5. 28 Nov, 2014 12 commits
    • Linus Torvalds's avatar
      Merge tag 'usb-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 4742eb3d
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some USB driver fixes and new device ids for 3.18-rc7.
      
        Full details are in the shortlog, and all of these have been in the
        linux-next tree for a while"
      
      * tag 'usb-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000
        usb: xhci: rework root port wake bits if controller isn't allowed to wakeup
        USB: xhci: Reset a halted endpoint immediately when we encounter a stall.
        Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
        USB: xhci: don't start a halted endpoint before its new dequeue is set
        USB: uas: Add no-uas quirk for Hitachi usb-3 enclosures 4971:1012
        USB: ssu100: fix overrun-error reporting
        USB: keyspan: fix overrun-error reporting
        USB: keyspan: fix tty line-status reporting
        usb: serial: ftdi_sio: add PIDs for Matrix Orbital products
        usb: dwc3: ep0: fix for dead code
        USB: serial: cp210x: add IDs for CEL MeshConnect USB Stick
      4742eb3d
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal · cba3b00d
      Linus Torvalds authored
      Pull thermal fixes from Eduardo Valentin:
       "In this -rc still very minor changes:
      
         - Lee Jones fixes compilation warning in sti thermal driver
         - Marjus Elfring removes unnecessary checks in exynos thermal driver
           (as per coccinelle)
         - Now we always update cpufreq policies, and thus get (hopefully)
           always in sync with cpufreq, thanks to Yadwinder"
      
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        thermal: Exynos: Deletion of unnecessary checks before two function calls
        thermal: sti: Ignore suspend/resume functions when !PM_SLEEP
        thermal: cpu_cooling: Update always cpufreq policy with thermal constraints
      cba3b00d
    • Linus Torvalds's avatar
      Merge tag 'sound-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 16cf45c0
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "No excitement, here are only minor fixes: an endian fix for the new
        DSD format we added in 3.18, a fix for HP mute LED, and a fix for
        Native Instrument quirk"
      
      * tag 'sound-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format
        ALSA: hda - One more HP machine needs to change mute led quirk
        ALSA: usb-audio: Use snd_usb_ctl_msg() for Native Instruments quirk
      16cf45c0
    • Linus Torvalds's avatar
      Merge tag 'armsoc-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 615b994e
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "Not much interesting going on fixes-wise for us this week, as it
        should be for an -rc7.  I'm not expecting Olof to work much over
        Thanksgiving weekend, so I decided to take over again and push these
        out to you.
      
        Just four simple fixes this week:
      
         - one missing of_node_put() on armv7 based mvebu
         - forcing the USB host into the right mode on Chromebook
           (exynos5-snow)
         - enabling two important drivers for exynos_defconfig
         - fixing a noncritical bug for tegra that would cause a regression
           with common code patches queued for 3.19"
      
      * tag 'armsoc-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: tegra: irq: fix buggy usage of irq_data irq field
        ARM: exynos_defconfig: Enable max77802 rtc and clock drivers
        ARM: dts: Explicitly set dr_mode on exynos5250-snow
        ARM: mvebu: add missing of_node_put() call in coherency.c
      615b994e
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · e818d5ed
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Another round of relatively small ARM fixes.
      
        Thomas spotted that the strex backoff delay bit was a disable bit, so
        it needed to be clear for this to work.  Vladimir spotted that using a
        restart block for the cache flush operation would return -EINTR, which
        userspace was not expecting.  Dmitry spotted that the auxiliary
        control register accesses for Xscale were not correct"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8226/1: cacheflush: get rid of restarting block
        ARM: 8222/1: mvebu: enable strex backoff delay
        ARM: 8216/1: xscale: correct auxiliary register in suspend/resume
      e818d5ed
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 21124e5c
      Dave Airlie authored
      Two regression fixes from Ville.
      
      * tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Cancel vdd off work before suspend
        drm/i915: Ignore SURFLIVE and flip counter when the GPU gets reset
      21124e5c
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 98e8d2e0
      Linus Torvalds authored
      Pull mips fixes from Ralf Baechle:
       "The hopefully final round of fixes for 3.18:
      
         - Fix a number of build errors affecting particular configurations.
         - Handle EVA correctly when flushing a signal trampoline and dcache
           lines.
         - Fix printks printing jibberish.
         - Handle 64 bit memory addresses correctly when adding memory chunk
           on 32 bit kernels.
         - Fix a race condition in the hardware tablewalker code"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: tlbex: Fix potential HTW race on TLBL/M/S handlers
        MIPS: Fix address type used for early memory detection.
        MIPS: Kconfig: Don't allow both microMIPS and SmartMIPS to be selected.
        MIPS: kernel: cps-vec: Set ISA level to mips32r2 for the MIPS MT ASE
        MIPS: Netlogic: handle modular AHCI builds
        MIPS: Netlogic: handle modular USB case
        MIPS: Loongson: Make platform serial setup always built-in.
        MIPS: fix EVA & non-SMP non-FPU FP context signal handling
        MIPS: cpu-probe: Set the FTLB probability bit on supported cores
        MIPS: BMIPS: Fix ".previous without corresponding .section" warnings
        MIPS: uaccess.h: Fix strnlen_user comment.
        MIPS: r4kcache: Add EVA case for protected_writeback_dcache_line
        MIPS: Fix info about plat_setup in arch_mem_init comment
        MIPS: rtlx: Remove KERN_DEBUG from pr_debug() arguments in rtlx.c
        MIPS: SEAD3: Fix LED device registration.
        MIPS: Fix a copy & paste error in unistd.h
      98e8d2e0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 21f122f4
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Here are five fixes for you to pull please.
      
        They're all CC'ed to stable except the "Fix PE state format" one which
        went in this release"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc: 32 bit getcpu VDSO function uses 64 bit instructions
        powerpc/powernv: Replace OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE
        powerpc/eeh: Fix PE state format
        powerpc/pseries: Fix endiannes issue in RTAS call from xmon
        powerpc/powernv: Fix the hmi event version check.
      21f122f4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · ae979430
      Linus Torvalds authored
      Pull sparc fixlet from David Miller:
       "Aparc fix to add dma_cache_sync(), even if a nop it should be provided
        if dma_{alloc,free}_noncoherent() is provided too"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Add NOP dma_cache_sync() implementation.
      ae979430
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8e845971
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "Several small fixes here:
      
         1) Don't crash in tg3 driver when the number of tx queues has been
            configured to be different from the number of rx queues.  From
            Thadeu Lima de Souza Cascardo.
      
         2) VLAN filter not disabled properly in promisc mode in ixgbe driver,
            from Vlad Yasevich.
      
         3) Fix OOPS on dellink op in VTI tunnel driver, from Xin Long.
      
         4) IPV6 GRE driver WCCP code checks skb->protocol for ETH_P_IP
            instead of ETH_P_IPV6, whoops.  From Yuri Chislov.
      
         5) Socket matching in ping driver is buggy when packet AF does not
            match socket's AF.  Fix from Jane Zhou.
      
         6) Fix checksum calculation errors in VXLAN due to where the
            udp_tunnel6_xmit_skb() helper gets it's saddr/daddr from.  From
            Alexander Duyck.
      
         7) Fix 5G detection problem in rtlwifi driver, from Larry Finger.
      
         8) Fix NULL deref in tcp_v{4,6}_send_reset, from Eric Dumazet.
      
         9) Various missing netlink attribute verifications in bridging code,
            from Thomas Graf.
      
        10) tcp_recvmsg() unconditionally calls ipv4 ip_recv_error even for
            ipv6 sockets, whoops.  Fix from Willem de Bruijn"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
        net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks
        bridge: Sanitize IFLA_EXT_MASK for AF_BRIDGE:RTM_GETLINK
        bridge: Add missing policy entry for IFLA_BRPORT_FAST_LEAVE
        net: Check for presence of IFLA_AF_SPEC
        net: Validate IFLA_BRIDGE_MODE attribute length
        bridge: Validate IFLA_BRIDGE_FLAGS attribute length
        stmmac: platform: fix default values of the filter bins setting
        net/mlx4_core: Limit count field to 24 bits in qp_alloc_res
        net: dsa: bcm_sf2: reset switch prior to initialization
        net: dsa: bcm_sf2: fix unmapping registers in case of errors
        tg3: fix ring init when there are more TX than RX channels
        tcp: fix possible NULL dereference in tcp_vX_send_reset()
        rtlwifi: Change order in device startup
        rtlwifi: rtl8821ae: Fix 5G detection problem
        Revert "netfilter: conntrack: fix race in __nf_conntrack_confirm against get_next_corpse"
        vxlan: Fix boolean flip in VXLAN_F_UDP_ZERO_CSUM6_[TX|RX]
        ip6_udp_tunnel: Fix checksum calculation
        net-timestamp: Fix a documentation typo
        net/ping: handle protocol mismatching scenario
        af_packet: fix sparse warning
        ...
      8e845971
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 190fc9d9
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "There's a couple of driver fixes here, plus one core fix for the DMA
        mapping which wasn't doing the right thing for vmalloc()ed addresses
        that hadn't been through kmap().  It's fairly rare to use vmalloc()
        with SPI and it's a subset of those users who might fail so it's
        unsurprising that this wasn't noticed sooner"
      
      * tag 'spi-v3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: sirf: fix word width configuration
        spi: Fix mapping from vmalloc-ed buffer to scatter list
        spi: dw: Fix dynamic speed change.
      190fc9d9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 0210bb60
      Linus Torvalds authored
      Pull input layer fixes from Dmitry Torokhov:
       "The main change is to fix breakage in Elantech driver introduced by
        the recent commit adding trackpoint reporting to protocol v4.  Now we
        are trusting the hardware to advertise the trackpoint properly and do
        not try to decode the data as trackpoint if firmware told us it is not
        present"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: xpad - use proper endpoint type
        Input: elantech - trust firmware about trackpoint presence
        Input: synaptics - adjust min/max on Thinkpad E540
      0210bb60
  6. 27 Nov, 2014 10 commits
  7. 26 Nov, 2014 3 commits