From: Dave Airlie Date: Tue, 2 Dec 2014 05:40:16 +0000 (+1000) Subject: Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6... X-Git-Tag: v3.18~15^2~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d87c0e3d9f42cd3582498eac2d7409cc0361c0cb;p=~emulex%2Finfiniband.git Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes 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 --- d87c0e3d9f42cd3582498eac2d7409cc0361c0cb