linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commits: 84073e568eec7 ("drm/i915/dg2:

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_bw.c between commit: ec663bca9128f ("drm/i915: Fix bw atomic check when switching between SAGV vs. no SAGV") from the drm-intel-fixes tree and commit: 6d8ebef53c2cc ("drm/i915:

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_reg.h between commit: b3f74938d656 ("drm/i915/pmu: Use PM timestamp instead of RING TIMESTAMP for reference") from the drm-intel-fixes tree and commit: 22ba60f617bd ("drm/i915: Move

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_device_info.c between commit: 0f9ed3b2c9ec ("drm/i915/display/cnl+: Handle fused off DSC") from the drm-intel-fixes tree and commit: a4d082fc194a ("drm/i915: rename/remove CNL

Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, On Tue, 30 Jun 2020 11:52:02 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/gvt/handlers.c > > between commit: > > fc1e3aa0337c ("drm/i915/gvt: Fix incorrect check of enabled bits in mask > registers")

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gvt/handlers.c between commit: fc1e3aa0337c ("drm/i915/gvt: Fix incorrect check of enabled bits in mask registers") from the drm-intel-fixes tree and commit: 5f4ae2704d59 ("drm/i915:

Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, On Wed, 11 Mar 2020 13:36:35 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/gvt/vgpu.c > > between commit: > > 04d6067f1f19 ("drm/i915/gvt: Fix unnecessary schedule timer when no vGPU > exits") > >

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gvt/vgpu.c between commit: 04d6067f1f19 ("drm/i915/gvt: Fix unnecessary schedule timer when no vGPU exits") from the drm-intel-fixes tree and commit: 12d5861973c7 ("drm/i915/gvt: Make WARN*

Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, This is now a conflict between the drm tree and Linus' tree. On Fri, 22 Mar 2019 10:57:28 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/gvt/mmio_context.c > > between commit: > > 1e8b15a1988e

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi Stephen, On Fri, Mar 22, 2019 at 10:57:28AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/gvt/mmio_context.c > > between commit: > > 1e8b15a1988e ("drm/i915/gvt: Add in context mmio 0x20D8 to gen9

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gvt/mmio_context.c between commit: 1e8b15a1988e ("drm/i915/gvt: Add in context mmio 0x20D8 to gen9 mmio list") from the drm-intel-fixes tree and commit: 8a68d464366e ("drm/i915: Store the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem_evict.c between commit: 99b169d3c2052 ("drm/i915: Fix eviction when the GGTT is idle but full") from the drm-intel-fixes tree and commit: 9c1477e83e629 ("drm/i915/selftests: Exercise

Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

On Tue, Oct 17, 2017 at 10:11:53AM +0200, Arnd Bergmann wrote: > This merge seems fine, but it seems there was another merge > against the akpm tree that introduced a build error by reintroducing > the spin_lock_irqsave() without restoring the local variable: > drivers/gpu/drm/i915/i915_gem.c:

Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

On Mon, Oct 16, 2017 at 1:35 PM, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/i915_gem.c > > between commit: > > b85577b72837e ("drm/i915: Order two completing nop_submit_request") > > from the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem.c between commit: b85577b72837e ("drm/i915: Order two completing nop_submit_request") from the drm-intel-fixes tree and commit: 5d031f4e1618b ("drm/i915: Stop asserting on set-wedged

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem.c between commit: b85577b72837ee ("drm/i915: Order two completing nop_submit_request") from the drm-intel-fixes tree and commit: af7a8ffad9c58d ("drm/i915: Use rcu instead of

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: 7b50f7b24cd6c ("rm/i915: Read timings from the correct transcoder in intel_crtc_mode_get()") from the drm-intel-fixes tree and commit: de330815677d8

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_engine_cs.c between commit: d9533f19d840 ("drm/i915: Hold a wakeref for probing the ring registers") (which is also commit a091d4ee931b in the drm-intel tree) from the drm-intel-fixes tree

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem_gtt.c between commit: d90c98905afd ("drm/i915: Guard against i915_ggtt_disable_guc() being invoked unconditionally") (which also appears as commit cb60606d835c in the drm-intel tree)

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gvt/scheduler.c between commit: 3cd23b828b37 ("drm/i915/gvt: GVT pin/unpin shadow context") from the drm-intel-fixes tree and commit: e642c85b03de ("drm/i915: Remove superfluous

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

On Wed, 24 Aug 2016, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/intel_display.c > > between commits from the drm-intel-fixes tree (some of which are > cherry-picked from the drm-intel tree) and teh same and

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commits from the drm-intel-fixes tree (some of which are cherry-picked from the drm-intel tree) and teh same and other commits from the drm-inte tree. These are just going

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_drv.h between commit: f403372658fc ("drm/i915/skl: Add support for the SAGV, fix underrun hangs") (which is a chery-pick of commit 656d1b89e5ff from the drm-intel tree) from the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_fbc.c between commit: 1e3fa0acfec6 ("drm/i915/fbc: Disable on HSW by default for now") from the drm-intel-fixes tree and commit: 80788a0fbbdf ("drm/i915/fbc: sanitize i915.enable_fbc

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: 76dc3769d7c3 ("drm/i915: Don't clobber the addfb2 ioctl params") from the drm-intel-fixes tree and commit: dcb1394e74e3 ("drm/i915: On fb alloc failure, unref

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_lrc.c between commit: dfc53c5e73f8 ("drm/i915: Consider HW CSB write pointer before resetting the sw read pointer") from the drm-intel-fixes tree and commit: 83843d84fcd3 ("drm/i915:

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi Jani, On Thu, 24 Sep 2015 11:57:05 +0300 Jani Nikula wrote: > > That was the right thing to do. > > The former commit is headed for v4.3, and there will have to be another > version of it for -next. This will cause you another conflict, and you > should resolve it with the same approach.

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

On Thu, 24 Sep 2015, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/intel_display.c > > between commit: > > 721a09f7393d ("drm/i915: Add primary plane to mask if it's visible") > > from the drm-intel-fixes tree

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: 721a09f7393d ("drm/i915: Add primary plane to mask if it's visible") from the drm-intel-fixes tree and commit: f9cd7b881a04 ("drm/i915: Move sprite/cursor

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: ccfb8b2ed4d4 ("rm/i915: Do not call intel_crtc_disable if the crtc is already disabled.") from the drm-intel-fixes tree and commit: 69024de8ba9e ("drm/i915:

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: 8aa3053bf731 ("drm/i915: fix oops in primary_check_plane") from the drm-intel-fixes tree and commit: da20eabd2c69 ("drm/i915: Split plane updates of

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

On Tue, Jul 14, 2015 at 12:11:12PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/intel_display.c > > between commit: > > 8aa3053bf731 ("drm/i915: fix oops in primary_check_plane") > > from the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_ringbuffer.h between commit: ee412ecc74c4 ("drm/i915: Snapshot seqno of most recently submitted request.") from the drm-intel-fixes tree and commit: bccca494f75c ("drm/i915: Remove the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: 8146ba1637a7 ("drm/i915: Store device pointer in contexts for late tracepoint usafe") from the drm-intel-fixes tree and commit: b1b38278e12b ("drm/i915: add a

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_drv.h between commit b3a38998f042 ("drm/i915: Fix a use after free, and unbalanced refcounting") from the drm-intel-fixes tree and commit 98e1bd4ae68e ("drm/i915: Cache ringbuf pointer in request

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit 62e537f8d568 ("drm/i915: Fix frontbuffer false positve") from the drm-intel-fixes tree and commit 6a418fcd84d6 ("drm/i915: Use fb modifiers in intel_check_cursor_plane")

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit f37b5c2be897 ("drm/i915: Align initial plane backing objects correctly") from the drm-intel-fixes tree and commit 6bf129df6ffa ("drm/i915: Use an intermediate variable to

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_runtime_pm.c between commit 7f1241ed1a06 ("drm/i915: Kill check_power_well() calls") from the drm-intel-fixes tree and commit e2c719b75c8c ("drm/i915: tame the chattermouth (v2)") from the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_drv.h between commit f93e94efebbe ("drm/i915: Fix dynamic allocation of physical handles") from the drm-intel-fixes tree and commit 5cc9ed4b9a7a ("drm/i915: Introduce mapping of user pages into

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_gem_gtt.c between commitcfa7c862982b ("drm/i915: Sanitize the enable_ppgtt module option once") from the drm-intel-fixes tree tree and commit 5db6c735ead5 ("drm/i915: dmesg output for VT-d testing")

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_pm.c between commit be3d26b0588c ("drm/i915: get a PC8 reference when enabling the power well") from the drm-intel-fixes tree and commit c1ca727f8945 ("drm/i915: support for multiple power wells")

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

On Mon, 2 Dec 2013 12:04:37 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in > drivers/gpu/drm/i915/intel_display.c between commit a1216444283e > ("drm/i915: use the correct force_wake function at the PC8 code") from > the drm-intel-fixes tree

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit a1216444283e ("drm/i915: use the correct force_wake function at the PC8 code") from the drm-intel-fixes tree and commit c8d9a5905e45 ("drm/i915: Add power well arguments to

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit 67c72a122541 (drm/i915: preserve pipe A quirk in i9xx_set_pipeconf) from the drm-intel-fixes tree and commit cf532bb25592 (drm/i915: Move double wide mode handling into

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit cc173961a680 (drm/i915: do not update cursor in crtc mode set) from the drm-intel-fixes tree and commit e9fd1c02aca7 (drm/i915: don't enable DPLL for DSI) from the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_pm.c between commit 14c5cec5d0cd ("drm/i915: initialize gt_lock early with other spin locks") from the drm-intel-fixes tree and commit 907b28c56ea4 ("drm/i915: Colocate all GT access routines in

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_dma.c between commit 14c5cec5d0cd ("drm/i915: initialize gt_lock early with other spin locks") from the drm-intel-fixes tree and commit 907b28c56ea4 ("drm/i915: Colocate all GT access routines in

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_dma.c between commit 14c5cec5d0cd (drm/i915: initialize gt_lock early with other spin locks) from the drm-intel-fixes tree and commit 907b28c56ea4 (drm/i915: Colocate all GT access routines in the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_pm.c between commit 14c5cec5d0cd (drm/i915: initialize gt_lock early with other spin locks) from the drm-intel-fixes tree and commit 907b28c56ea4 (drm/i915: Colocate all GT access routines in the

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit 067556084a0e ("drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list") from the drm-intel-fixes tree and commit 5cef07e16283 ("drm/i915: Move

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_dma.c between commit 7dcd2677ea91 ("drm/i915: fix long-standing SNB regression in power consumption after resume v2") from the drm-intel-fixes tree and commit 59cdb63d529c ("drm/i915: kill

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_dma.c between commit 7dcd2677ea91 (drm/i915: fix long-standing SNB regression in power consumption after resume v2) from the drm-intel-fixes tree and commit 59cdb63d529c (drm/i915: kill

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commit 067556084a0e (drm/i915: Correct obj-mm_list link to dev_priv-dev_priv-mm.inactive_list) from the drm-intel-fixes tree and commit 5cef07e16283 (drm/i915: Move active/inactive

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_gem.c between commits 19b2dbde5732 ("drm/i915: Restore fences after resume and GPU resets") from Linus' tree and d18b96190342 ("drm/i915: Fix incoherence with fence updates on Sandybridge+") from