1. 20 Nov, 2015 3 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · c69bde78
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "A varied bunch of fixes, the radeon pull is probably a bit larger than
        I'd like, but it contains 2 weeks of stuff, and the Fiji fixes are a
        bit large, but they are Fiji specific.
      
        Otherwise:
      
         - mgag200: One cursor regression oops fix.
         - vc4: A few small fixes and cleanups.
         - core: Atomic fixes and Atomic helper fixes
         - i915: Revert for the backlight regression along with a bunch of
           fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (58 commits)
        drm/atomic-helper: Check encoder/crtc constraints
        Revert "drm/i915: skip modeset if compatible for everyone."
        drm/mgag200: fix kernel hang in cursor code.
        drm/amdgpu: reserve/unreserve objects out of map/unmap operations
        drm/amdgpu: move bo_reserve out of amdgpu_vm_clear_bo
        drm/amdgpu: add lock for interval tree in vm
        drm/amdgpu: keep the owner for VMIDs
        drm/amdgpu: move VM manager clean into the VM code again
        drm/amdgpu: cleanup VM coding style
        drm/amdgpu: remove unused VM manager field
        drm/amdgpu: cleanup scheduler command submission
        drm/amdgpu: fix typo in firmware name
        drm/i915: Consider SPLL as another shared pll, v2.
        drm/i915: Fix gpu frequency change tracing
        drm/vc4: Make sure that planes aren't scaled.
        drm/vc4: Fix some failure to track __iomem decorations on pointers.
        drm/vc4: checking for NULL instead of IS_ERR
        drm/vc4: fix itnull.cocci warnings
        drm/vc4: fix platform_no_drv_owner.cocci warnings
        drm/vc4: vc4_plane_duplicate_state() can be static
        ...
      c69bde78
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.4' of git://git.code.sf.net/p/openipmi/linux-ipmi · cd6caf55
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "Some fixes for small IPMI problems.
      
        The most significant is that the driver wasn't starting the timer for
        some messages, which would result in problems if that message failed
        for some reason.
      
        The others are small optimizations or making things a little neater"
      
      * tag 'for-linus-4.4' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi watchdog : add panic_wdt_timeout parameter
        char: ipmi: Move MODULE_DEVICE_TABLE() to follow struct
        ipmi: Stop the timer immediately if idle
        ipmi: Start the timer and thread on internal msgs
      cd6caf55
    • Linus Torvalds's avatar
      Merge tag 'renesas-sh-drivers-for-v4.4' of... · 8bdddfae
      Linus Torvalds authored
      Merge tag 'renesas-sh-drivers-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      Pull SH driver fixlet from Simon Horman:
       "I am sending this change after v4.4-rc1 has been released as it
        depends on SoC changes which are present in that rc:
      
         = Remove now unnecessary reference to CONFIG_ARCH_SHMOBILE_MULTI"
      
      * tag 'renesas-sh-drivers-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        drivers: sh: Get rid of CONFIG_ARCH_SHMOBILE_MULTI
      8bdddfae
  2. 19 Nov, 2015 12 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 2d591ab1
      Dave Airlie authored
      i915 fixes for 4.4, including the revert for the backlight regression
      Olof reported. Otherwise fixes all around.
      
      * tag 'drm-intel-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel:
        Revert "drm/i915: skip modeset if compatible for everyone."
        drm/i915: Consider SPLL as another shared pll, v2.
        drm/i915: Fix gpu frequency change tracing
        drm/i915: Don't clobber the addfb2 ioctl params
        drm/i915: Clear intel_crtc->atomic before updating it.
        drm/i915: get runtime PM reference around GEM set_caching IOCTL
        drm/i915: Fix GT frequency rounding
        drm/i915: quirk backlight present on Macbook 4, 1
        drm/i915: Fix crtc_y assignment in intel_find_initial_plane_obj()
      2d591ab1
    • Dave Airlie's avatar
      Merge tag 'topic/drm-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes · db395637
      Dave Airlie authored
      Here are some drm core fixes for v4.4 that I've picked up. Atomic fixes
      from Maarten, and atomic helper fixes from Ville and Daniel.
      
      Admittedly the topmost commit didn't sit in our tree for very long, but
      does come with reviews and testing from trustworthy people.
      
      * tag 'topic/drm-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel:
        drm/atomic-helper: Check encoder/crtc constraints
        drm: Fix primary plane size for stereo doubled modes for legacy setcrtc
        drm/core: Fix old_fb handling in pan_display_atomic.
        drm/core: Fix old_fb handling in restore_fbdev_mode_atomic.
        drm/atomic: add a drm_atomic_clean_old_fb helper.
        drm/core: Fix old_fb handling in drm_mode_atomic_ioctl.
        drm/core: Set legacy_cursor_update in drm_atomic_helper_disable_plane.
      db395637
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · b4ba1f0f
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
      
       - Fix size alignment in __iommu_{alloc,free}_attrs
      
       - Kernel memory mapping fix with CONFIG_DEBUG_RODATA for page sizes
         other than 4KB and a fix of the mark_rodata_ro permissions
      
       - dma_get_ops() simplification and behaviour alignment between DT and
         ACPI
      
       - function_graph trace fix for cpu_suspend() (CPUs returning from deep
         sleep via a different path and confusing the tracer)
      
       - Use of non-global mappings for UEFI run-time services to avoid a
         (potentially theoretical) TLB conflict
      
       - Crypto priority reduction of core AES cipher (the accelerated
         asynchronous implementation is preferred when available)
      
       - Reverting an old commit that removed BogoMIPS from /proc/cpuinfo on
         arm64.  Apparently, we had it for a relatively short time and libvirt
         started checking for its presence
      
       - Compiler warnings fixed (ptrace.h inclusion from compat.h,
         smp_load_acquire with const argument)
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: restore bogomips information in /proc/cpuinfo
        arm64: barriers: fix smp_load_acquire to work with const arguments
        arm64: Fix R/O permissions in mark_rodata_ro
        arm64: crypto: reduce priority of core AES cipher
        arm64: use non-global mappings for UEFI runtime regions
        arm64: kernel: pause/unpause function graph tracer in cpu_suspend()
        arm64: do not include ptrace.h from compat.h
        arm64: simplify dma_get_ops
        arm64: mm: use correct mapping granularity under DEBUG_RODATA
        arm64/dma-mapping: Fix sizes in __iommu_{alloc,free}_attrs
      b4ba1f0f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · a3d66b5a
      Linus Torvalds authored
      Pull livepatching fix from Jiri Kosina:
       "A fix for module handling in case kASLR has been enabled, from Zhou
        Chengming"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: x86: fix relocation computation with kASLR
      a3d66b5a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 319645ca
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
       "Two functional fixes for wacom HID driver from Ping Cheng and Jiri
        Kosina"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wacom: fixup quirks setup for WACOM_DEVICETYPE_PAD
        HID: wacom: Add outbounding area for DTU1141
      319645ca
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.4-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 1282ac40
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are some mmc fixes intended for v4.4 rc2.  It's based on a commit
        prior rc1 as I wanted to get them a bit more tested in next before
        sending you the pull request.
      
        MMC core:
         - Improve reliability when selecting HS200 mode
         - Improve reliability when selecting HS400 mode
         - mmc: remove bondage between REQ_META and reliable write
      
        MMC host:
         - pxamci: Fix read-only gpio detection polarity
         - mtk-sd: Preinitialize delay_phase to fix the case when delay is zero
         - android-goldfish: Fix build dependency by adding HAS_DMA
         - dw_mmc: Remove Seungwon Jeon from MAINTAINERS"
      
      * tag 'mmc-v4.4-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: remove bondage between REQ_META and reliable write
        mmc: MMC_GOLDFISH should depend on HAS_DMA
        mmc: mediatek: Preinitialize delay_phase in get_best_delay()
        MAINTAINERS: mmc: Remove Seungwon Jeon from dw_mmc
        mmc: mmc: Improve reliability of mmc_select_hs400()
        mmc: mmc: Move mmc_switch_status()
        mmc: mmc: Fix HS setting in mmc_select_hs400()
        mmc: mmc: Improve reliability of mmc_select_hs200()
        mmc: pxamci: fix read-only gpio detection polarity
      1282ac40
    • Yang Shi's avatar
      arm64: restore bogomips information in /proc/cpuinfo · 92e788b7
      Yang Shi authored
      As previously reported, some userspace applications depend on bogomips
      showed by /proc/cpuinfo. Although there is much less legacy impact on
      aarch64 than arm, it does break libvirt.
      
      This patch reverts commit 326b16db ("arm64: delay: don't bother
      reporting bogomips in /proc/cpuinfo"), but with some tweak due to
      context change and without the pr_info().
      
      Fixes: 326b16db ("arm64: delay: don't bother reporting bogomips in /proc/cpuinfo")
      Signed-off-by: default avatarYang Shi <yang.shi@linaro.org>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Cc: <stable@vger.kernel.org> # 3.12+
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      92e788b7
    • Daniel Vetter's avatar
      drm/atomic-helper: Check encoder/crtc constraints · 5481c8fb
      Daniel Vetter authored
      This was totally lost when I originally created the atomic helpers.
      
      We probably should also check possible_clones in the helpers, but
      since the legacy ones didn't do that this is for a separate patch.
      Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Daniel Stone <daniels@collabora.com>
      Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Tested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1447868808-10266-1-git-send-email-daniel.vetter@ffwll.ch
      5481c8fb
    • Jani Nikula's avatar
      Revert "drm/i915: skip modeset if compatible for everyone." · 73831236
      Jani Nikula authored
      This reverts
      
      commit 6764e9f8
      Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Date:   Thu Aug 27 15:44:06 2015 +0200
      
          drm/i915: skip modeset if compatible for everyone.
      
      Bring back the i915.fastboot module parameter, disabled by default, due
      to backlight regression on Chromebook Pixel 2015.
      
      Apparently the firmware of the Chromebook in question enables the panel
      but disables backlight to avoid a brief garbage scanout upon loading the
      kernel/module. With fastboot, we leave the backlight untouched, in this
      case disabled. The user would have to do a modeset (i.e. not just crank
      up the brightness) to enable the backlight.
      
      There is no clean fix readily available, so get back to the drawing
      board by reverting.
      
      [N.B. The reference below is for when the thread was included on public
      lists, and some of the context had already been dropped by then.]
      Reported-and-tested-by: default avatarOlof Johansson <olof@lixom.net>
      Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      References: http://marc.info/?i=CAKMK7uES7xk05ki92oeX6gmvZWAh9f2vL7yz=6T+fGK9J3X7cQ@mail.gmail.com
      Fixes: 6764e9f8 ("drm/i915: skip modeset if compatible for everyone.")
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1447921590-3785-1-git-send-email-jani.nikula@intel.com
      73831236
    • Wang, Rui Y's avatar
      drm/mgag200: fix kernel hang in cursor code. · f6619ef7
      Wang, Rui Y authored
      The machine hang completely with the following message on the console:
      
      [  487.777538] BUG: unable to handle kernel NULL pointer dereference at 0000000000000060
      [  487.777554] IP: [<ffffffff8158aaee>] _raw_spin_lock+0xe/0x30
      [  487.777557] PGD 42e9f7067 PUD 42f2fa067 PMD 0
      [  487.777560] Oops: 0002 [#1] SMP
      ...
      [  487.777618] CPU: 21 PID: 3190 Comm: Xorg Tainted: G            E   4.4.0-rc1-3-default+ #6
      [  487.777620] Hardware name: Intel Corporation BRICKLAND/BRICKLAND, BIOS BRHSXSD1.86B.0059.R00.1501081238 01/08/2015
      [  487.777621] task: ffff880853ae4680 ti: ffff8808696d4000 task.ti: ffff8808696d4000
      [  487.777625] RIP: 0010:[<ffffffff8158aaee>]  [<ffffffff8158aaee>] _raw_spin_lock+0xe/0x30
      [  487.777627] RSP: 0018:ffff8808696d79c0  EFLAGS: 00010246
      [  487.777628] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
      [  487.777629] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000060
      [  487.777630] RBP: ffff8808696d79e0 R08: 0000000000000000 R09: ffff88086924a780
      [  487.777631] R10: 000000000001bb40 R11: 0000000000003246 R12: 0000000000000000
      [  487.777632] R13: ffff880463a27360 R14: ffff88046ca50218 R15: 0000000000000080
      [  487.777634] FS:  00007f3f81c5a8c0(0000) GS:ffff88086f060000(0000) knlGS:0000000000000000
      [  487.777635] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [  487.777636] CR2: 0000000000000060 CR3: 000000042e678000 CR4: 00000000001406e0
      [  487.777638] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      [  487.777639] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
      [  487.777639] Stack:
      [  487.777642]  ffffffffa00eb5fa ffff8808696d7b60 ffff88086b87d800 0000000000000000
      [  487.777644]  ffff8808696d7ac8 ffffffffa01694b6 ffff8808696d7ae8 ffffffff8109c8d5
      [  487.777647]  ffff880469158740 ffff880463a27000 ffff88086b87d800 ffff88086b87d800
      [  487.777647] Call Trace:
      [  487.777674]  [<ffffffffa00eb5fa>] ? drm_gem_object_lookup+0x1a/0xa0 [drm]
      [  487.777681]  [<ffffffffa01694b6>] mga_crtc_cursor_set+0xc6/0xb60 [mgag200]
      [  487.777691]  [<ffffffff8109c8d5>] ? find_busiest_group+0x35/0x4a0
      [  487.777696]  [<ffffffff81086294>] ? __might_sleep+0x44/0x80
      [  487.777699]  [<ffffffff815888c2>] ? __ww_mutex_lock+0x22/0x9c
      [  487.777722]  [<ffffffffa0104f64>] ? drm_modeset_lock+0x34/0xf0 [drm]
      [  487.777733]  [<ffffffffa0148d9e>] restore_fbdev_mode+0xee/0x2a0 [drm_kms_helper]
      [  487.777742]  [<ffffffffa014afce>] drm_fb_helper_restore_fbdev_mode_unlocked+0x2e/0x70 [drm_kms_helper]
      [  487.777748]  [<ffffffffa014b037>] drm_fb_helper_set_par+0x27/0x50 [drm_kms_helper]
      [  487.777752]  [<ffffffff8134560c>] fb_set_var+0x18c/0x3f0
      [  487.777777]  [<ffffffffa02a9b0a>] ? __ext4_handle_dirty_metadata+0x8a/0x210 [ext4]
      [  487.777783]  [<ffffffff8133cb97>] fbcon_blank+0x1b7/0x2b0
      [  487.777790]  [<ffffffff813be2a3>] do_unblank_screen+0xb3/0x1c0
      [  487.777795]  [<ffffffff813b5aba>] vt_ioctl+0x118a/0x1210
      [  487.777801]  [<ffffffff813a8fe0>] tty_ioctl+0x3f0/0xc90
      [  487.777808]  [<ffffffff81172018>] ? kzfree+0x28/0x30
      [  487.777813]  [<ffffffff811e053f>] ? mntput+0x1f/0x30
      [  487.777817]  [<ffffffff811d3f5d>] do_vfs_ioctl+0x30d/0x570
      [  487.777822]  [<ffffffff8107ed3a>] ? task_work_run+0x8a/0xa0
      [  487.777825]  [<ffffffff811d4234>] SyS_ioctl+0x74/0x80
      [  487.777829]  [<ffffffff8158aeae>] entry_SYSCALL_64_fastpath+0x12/0x71
      [  487.777851] Code: 65 ff 0d ce 02 a8 7e 5d c3 ba 01 00 00 00 f0 0f b1 17 85 c0 75 e8 b0 01 5d c3 0f 1f 00 65 ff 05 b1 02 a8 7e 31 c0 ba 01 00 00 00 <f0> 0f b1 17 85 c0 75 01 c3 55 89 c6 48 89 e5 e8 4e f5 b1 ff 5d
      [  487.777854] RIP  [<ffffffff8158aaee>] _raw_spin_lock+0xe/0x30
      [  487.777855]  RSP <ffff8808696d79c0>
      [  487.777856] CR2: 0000000000000060
      [  487.777860] ---[ end trace 672a2cd555e0ebd3 ]---
      
      The cursor code may be entered with file_priv == NULL && handle == NULL.
      The problem was introduced by:
      
      "bf89209a drm/mga200g: Hold a proper reference for cursor_set"
      
      which calls drm_gem_object_lookup(dev, file_priv...). Previously this wasn't
      a problem because we checked the handle. Move the check early in the function
      can fix the problem.
      Signed-off-by: default avatarRui Wang <rui.y.wang@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      f6619ef7
    • Dave Airlie's avatar
      Merge branch 'drm-vc4-fixes' of git://github.com/anholt/linux into drm-fixes · e6c84acb
      Dave Airlie authored
      Here are a few little VC4 fixes for 4.4 that I didn't get in to you
      before the -next pull request.  I dropped the feature-ish one I'd
      mentioned, and also droppped the one I saw you included in the last
      -fixes pull request.
      
      * 'drm-vc4-fixes' of git://github.com/anholt/linux:
        drm/vc4: Make sure that planes aren't scaled.
        drm/vc4: Fix some failure to track __iomem decorations on pointers.
        drm/vc4: checking for NULL instead of IS_ERR
        drm/vc4: fix itnull.cocci warnings
        drm/vc4: fix platform_no_drv_owner.cocci warnings
        drm/vc4: vc4_plane_duplicate_state() can be static
      e6c84acb
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 8ed59fd6
      Dave Airlie authored
      Radeon and amdgpu fixes for 4.4.  A bit more the usual since I missed
      last week.  Misc fixes all over the place.  The big changes are the
      tiling configuration fixes for Fiji.
      
      * 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux: (35 commits)
        drm/amdgpu: reserve/unreserve objects out of map/unmap operations
        drm/amdgpu: move bo_reserve out of amdgpu_vm_clear_bo
        drm/amdgpu: add lock for interval tree in vm
        drm/amdgpu: keep the owner for VMIDs
        drm/amdgpu: move VM manager clean into the VM code again
        drm/amdgpu: cleanup VM coding style
        drm/amdgpu: remove unused VM manager field
        drm/amdgpu: cleanup scheduler command submission
        drm/amdgpu: fix typo in firmware name
        drm/amdgpu: remove the unnecessary parameter adev for amdgpu_sa_bo_new()
        drm/amdgpu: wait interruptible when semaphores are disabled v2
        drm/amdgpu: update pd while updating vm as well
        drm/amdgpu: fix handling order in scheduler CS
        drm/amdgpu: fix incorrect mutex usage v3
        drm/amdgpu: cleanup scheduler fence get/put dance
        drm/amdgpu: add command submission workflow tracepoint
        drm/amdgpu: update Fiji's tiling mode table
        drm/amdgpu: fix bug that can't enter thermal interrupt for bonaire.
        drm/amdgpu: fix seq_printf format string
        drm/radeon: fix quirk for MSI R7 370 Armor 2X
        ...
      8ed59fd6
  3. 18 Nov, 2015 17 commits
  4. 17 Nov, 2015 8 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 7f151f1d
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix list tests in netfilter ingress support, from Florian Westphal.
      
       2) Fix reversal of input and output interfaces in ingress hook
          invocation, from Pablo Neira Ayuso.
      
       3) We have a use after free in r8169, caught by Dave Jones, fixed by
          Francois Romieu.
      
       4) Splice use-after-free fix in AF_UNIX frmo Hannes Frederic Sowa.
      
       5) Three ipv6 route handling bug fixes from Martin KaFai Lau:
          a) Don't create clone routes not managed by the fib6 tree
          b) Don't forget to check expiration of DST_NOCACHE routes.
          c) Handle rt->dst.from == NULL properly.
      
       6) Several AF_PACKET fixes wrt transport header setting and SKB
          protocol setting, from Daniel Borkmann.
      
       7) Fix thunder driver crash on shutdown, from Pavel Fedin.
      
       8) Several Mellanox driver fixes (max MTU calculations, use of correct
          DMA unmap in TX path, etc.) from Saeed Mahameed, Tariq Toukan, Doron
          Tsur, Achiad Shochat, Eran Ben Elisha, and Noa Osherovich.
      
       9) Several mv88e6060 DSA driver fixes (wrong bit definitions for
          certain registers, etc.) from Neil Armstrong.
      
      10) Make sure to disable preemption while updating per-cpu stats of ip
          tunnels, from Jason A.  Donenfeld.
      
      11) Various ARM64 bpf JIT fixes, from Yang Shi.
      
      12) Flush icache properly in ARM JITs, from Daniel Borkmann.
      
      13) Fix masking of RX and TX interrupts in ravb driver, from Masaru
          Nagai.
      
      14) Fix netdev feature propagation for devices not implementing
          ->ndo_set_features().  From Nikolay Aleksandrov.
      
      15) Big endian fix in vmxnet3 driver, from Shrikrishna Khare.
      
      16) RAW socket code increments incorrect SNMP counters, fix from Ben
          Cartwright-Cox.
      
      17) IPv6 multicast SNMP counters are bumped twice, fix from Neil Horman.
      
      18) Fix handling of VLAN headers on stacked devices when REORDER is
          disabled.  From Vlad Yasevich.
      
      19) Fix SKB leaks and use-after-free in ipvlan and macvlan drivers, from
          Sabrina Dubroca.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (83 commits)
        MAINTAINERS: Update Mellanox's Eth NIC driver entries
        net/core: revert "net: fix __netdev_update_features return.." and add comment
        af_unix: take receive queue lock while appending new skb
        rtnetlink: fix frame size warning in rtnl_fill_ifinfo
        net: use skb_clone to avoid alloc_pages failure.
        packet: Use PAGE_ALIGNED macro
        packet: Don't check frames_per_block against negative values
        net: phy: Use interrupts when available in NOLINK state
        phy: marvell: Add support for 88E1540 PHY
        arm64: bpf: make BPF prologue and epilogue align with ARM64 AAPCS
        macvlan: fix leak in macvlan_handle_frame
        ipvlan: fix use after free of skb
        ipvlan: fix leak in ipvlan_rcv_frame
        vlan: Do not put vlan headers back on bridge and macvlan ports
        vlan: Fix untag operations of stacked vlans with REORDER_HEADER off
        via-velocity: unconditionally drop frames with bad l2 length
        ipg: Remove ipg driver
        dl2k: Add support for IP1000A-based cards
        snmp: Remove duplicate OUTMCAST stat increment
        net: thunder: Check for driver data in nicvf_remove()
        ...
      7f151f1d
    • Eric Anholt's avatar
      drm/vc4: Make sure that planes aren't scaled. · bf893acc
      Eric Anholt authored
      We would scan out the memory around them if an upscale was attempted,
      and would just scan out incorrectly for downscaling.
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      bf893acc
    • Eric Anholt's avatar
      drm/vc4: Fix some failure to track __iomem decorations on pointers. · 36f4f69a
      Eric Anholt authored
      Caught by the kbuild test robot.
      
      v2: Fix the +i I dropped in the first version.
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      36f4f69a
    • Dan Carpenter's avatar
      drm/vc4: checking for NULL instead of IS_ERR · 79513237
      Dan Carpenter authored
      vc4_plane_init() returns an ERR_PTR on error, it doesn't return NULL.
      This was obviously intended because the next lines call
      PTR_ERR(primary_plane) already.
      
      Fixes: c8b75bca ('Eric Anholt <eric@anholt.net>')
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      79513237
    • Julia Lawall's avatar
      drm/vc4: fix itnull.cocci warnings · 2fa8e904
      Julia Lawall authored
      Connector cannot be null because it is a list entry, ie accessed at an
      offset from the positions of the list structure pointers themselves.
      
      Generated by: scripts/coccinelle/iterators/itnull.cocci
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      2fa8e904
    • Julia Lawall's avatar
      drm/vc4: fix platform_no_drv_owner.cocci warnings · e2ab3218
      Julia Lawall authored
      drivers/gpu/drm/vc4/vc4_drv.c:248:3-8: No need to set .owner here. The core will do it.
      
       Remove .owner field if calls are used which set it automatically
      
      Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      e2ab3218
    • kbuild test robot's avatar
    • Or Gerlitz's avatar
      MAINTAINERS: Update Mellanox's Eth NIC driver entries · e7523a49
      Or Gerlitz authored
      Eugenia (Jenny) Emantayev is replacing Amir Vadai as the
      mlx4 Ethernet driver maintainer.
      
      Saeed Mahameed is assigned to maintain mlx5 Eth functionality.
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e7523a49