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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp.c between commit: fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()") from Linus' tree and commit: cd572b3bb27e ("drm/i915: Disable hotplug detection

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

Hi all, On Wed, 22 Nov 2023 11:51:37 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > > between commit: > > 9031e0013f81 ("drm/amd/display: Fix mst hub unplug warning") > >

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c between commit: 9031e0013f81 ("drm/amd/display: Fix mst hub unplug warning") from Linus' tree and commit: 191dc43935d1 ("drm/dp_mst: Store the MST PBN

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_driver.c between commit: 2293a73ad4f3 ("drm/i915: Remove unused variable") from Linus' tree and commit: e5e43d3363d7 ("drm/i915/display: Pass drm_i915_private as param to i915 funcs")

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

On Mon, Nov 14, 2022 at 01:02:46PM +0200, Jani Nikula wrote: > On Mon, 14 Nov 2022, Hans de Goede wrote: > > Hi, > > > > On 11/14/22 11:10, Jani Nikula wrote: > >> On Mon, 14 Nov 2022, Hans de Goede wrote: > >>> Hi, > >>> > >>> On 11/14/22 00:23, Stephen Rothwell wrote: > Hi all, > >

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

On Mon, 14 Nov 2022, Hans de Goede wrote: > Hi, > > On 11/14/22 11:10, Jani Nikula wrote: >> On Mon, 14 Nov 2022, Hans de Goede wrote: >>> Hi, >>> >>> On 11/14/22 00:23, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the drm-intel tree got a conflict in:

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

Hi, On 11/14/22 11:10, Jani Nikula wrote: > On Mon, 14 Nov 2022, Hans de Goede wrote: >> Hi, >> >> On 11/14/22 00:23, Stephen Rothwell wrote: >>> Hi all, >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in: >>> >>> drivers/gpu/drm/i915/display/intel_backlight.c >>> >>>

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

On Mon, 14 Nov 2022, Hans de Goede wrote: > Hi, > > On 11/14/22 00:23, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the drm-intel tree got a conflict in: >> >> drivers/gpu/drm/i915/display/intel_backlight.c >> >> between commit: >> >> b1d36e73cc1c ("drm/i915: Don't

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

Hi, On 11/14/22 00:23, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_backlight.c > > between commit: > > b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight > should be

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_backlight.c between commit: b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)") from Linus' tree and commit: 801543b2593b ("drm/i915:

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_driver.c between commit: 1c66a12ab431 ("drm/i915: Handle each GT on init/release and suspend/resume") from Linus' tree and commit: 3703060d17b0 ("drm/i915/display: remove drm_device

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gt/intel_rps.c between commit: 56758cc45955 ("drm/i915/rps: Centralize computation of freq caps") from Linus' tree and commit: ee421bb4cb95 ("drm/i915/pcode: Extend pcode functions for

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dmc_regs.h between commit: 2518f226c60d ("Merge tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm") from Linus' tree and commit: 21c47196aec3 ("drm/i915/dmc:

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_device_info.h between commit: 5e3094cfd9fb ("drm/i915/xehpsdv: Add has_flat_ccs to device info") from Linus' tree and commit: 072ce4164f97 ("drm/i915/dg2: Tile 4 plane format support")

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_pci.c between commit: 132aaaf01788 ("drm/i915: add needs_compact_pt flag") from Linus' tree and commits: 072ce4164f97 ("drm/i915/dg2: Tile 4 plane format support") 412c942bdfae

linux-next: manual merge of the drm-intel tree with Linus' 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: cca084692394 ("drm/i915: Use per device iommu check") from Linus' tree and commit: 8172375ea95a ("drm/i915: Remove zombie async flip vt-d w/a") from the drm-intel

linux-next: manual merge of the drm-intel tree with Linus' 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: 77cdd054dd2c ("drm/i915/pmu: Connect engine busyness stats from GuC to pmu") from Linus' tree and commit: 202b1f4c1234 ("drm/i915/gt: Move engine registers to their

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_display.c between commit: b4bde5554f70 ("drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs()") from Linus' tree and commits: cad83b405fe4 ("drm/i915/display:

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

Hi all, On Thu, 20 May 2021 10:19:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/i915_mm.c > > between commit: > > 293837b9ac8d ("Revert "i915: fix remap_io_sg to verify the pgprot"") > > from Linus' tree

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_mm.c between commit: 293837b9ac8d ("Revert "i915: fix remap_io_sg to verify the pgprot"") from Linus' tree and commit: ec279384c6a0 ("drm/i915: Initialize err in remap_io_sg()") from

linux-next: manual merge of the drm-intel tree with Linus' 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: e7c6e405e171 ("Fix misc new gcc warnings") from Linus' tree and commit: c6deb5e97ded ("drm/i915/pm: Make the wm parameter of print_wm_latency a pointer") from the

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

Hi, On 9/8/20 1:04 PM, Stephen Rothwell wrote: Hi Hans, On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede wrote: On 9/8/20 6:00 AM, Stephen Rothwell wrote: Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_panel.c between commit:

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

Hi Hans, On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede wrote: > > On 9/8/20 6:00 AM, Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > >drivers/gpu/drm/i915/display/intel_panel.c > > > > between commit: > > > >f8bd54d21904

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

Hi Stephen, On 9/8/20 6:00 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_panel.c between commit: f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller")

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_panel.c between commit: f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") from Linus' tree and commit: 6b51e7d23aa8 ("drm/i915:

linux-next: manual merge of the drm-intel tree with Linus' 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: 7fb81e9d8073 ("drm/i915: Use drmm_add_final_kfree") from Linus' tree and commit: 8a25c4be583d ("drm/i915/params: switch to device specific parameters") from the

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

Quoting Stephen Rothwell (2018-03-23 02:50:18) > Hi all, > > On Thu, 22 Mar 2018 13:21:29 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > > drivers/gpu/drm/i915/gvt/scheduler.c > > > > between commit: > >

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

Hi all, On Thu, 22 Mar 2018 13:21:29 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/gvt/scheduler.c > > between commit: > > fa3dd623e559 ("drm/i915/gvt: keep oa config in shadow ctx") >

linux-next: manual merge of the drm-intel tree with Linus' 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: fa3dd623e559 ("drm/i915/gvt: keep oa config in shadow ctx") from Linus' tree and commit: b20c0d5ce104 ("drm/i915/gvt: Update PDPs after a vGPU mm object is

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/media/v4l2-core/videobuf2-dma-contig.c between commit: 5b6f9abe5a49 ("media: vb2: add bidirectional flag in vb2_queue") from Linus' tree and commit: c4860ad60564 ("lib/scatterlist: Fix offset type in

linux-next: manual merge of the drm-intel tree with Linus' 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: f403372658fc ("drm/i915/skl: Add support for the SAGV, fix underrun hangs") (which is also in the drm-intel tree) from Linus' tree and commit: 6f3fff602e81

linux-next: manual merge of the drm-intel tree with Linus' 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: 9909113cc48a ("drm/i915/gen9: Only copy WM results for changed pipes to skl_hw") from Linus' tree and commits: 2722efb90b34 ("drm/i915/gen9: Only copy WM results

linux-next: manual merge of the drm-intel tree with Linus' 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: 9bd18728a3f2 ("drm/i915: Ignore stale wm register values on resume on ilk-bdw (v2)") from Linus' tree and commit: e3d5457c7caa ("drm/i915: Ignore stale wm

linux-next: manual merge of the drm-intel tree with Linus' 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: 5fbd0418eef2 ("drm/i915: Re-enable GGTT earlier during resume on pre-gen6 platforms") (which also exists in the drm-intel tree as commit ac840ae53573) from Linus'

linux-next: manual merge of the drm-intel tree with Linus' 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: 344df9809f45 ("drm/i915/skl: Disable coarse power gating up until F0") from Linus' tree and commit: 06e668ac91c9 ("drm/i915: Apply broader

linux-next: manual merge of the drm-intel tree with Linus' 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 commitis: bc5f2ab11ca6 ("drm/i915/skl: Don't call intel_prepare_ddi when encoder list isn't yet initialized.") 1b0e3a049efe ("drm/i915/skl: disable display side

linux-next: manual merge of the drm-intel tree with Linus' 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 Linus' tree and commit: bd0335b29903 ("drm/i915: Add primary plane to mask if it's

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_audio.c between commit: 51e1d83cab99 ("drm/i915: Call audio pin/ELD notify function") from Linus' tree and commit: b8abe859c9d6 ("drm/i915: Always call the adjusted mode

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_irq.c between commit: 4e3d1e26c2b2 ("drm/i915: Pass hpd_status_i915[] to intel_get_hpd_pins() in pre-g4x") from Linus' tree and commit: 58f2cf241fb9 ("drm/i915: Don't call

linux-next: manual merge of the drm-intel tree with Linus' 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: 00245266b4be ("drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path") from Linus' tree and commit: 567047be2a7e ("drm/i915/gtt: Use macros to

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_drv.c between commit 5df0582bf036 ("drm/i915/vlv: remove wait for previous GFX clk disable request") from Linus' tree and commit 85250ddff7a6 ("drm/i915/chv: Remove Wait for a previous gfx

linux-next: manual merge of the drm-intel tree with Linus' 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 a4bf214ffc72 ("drm/i915: Move intel_ddi_set_vc_payload_alloc(false) to haswell_crtc_disable()") from Linus' tree and commit 575f7ab754c4 ("drm/i915: Pass intel_crtc to

linux-next: manual merge of the drm-intel tree with Linus' 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 fec8cba306f9 ("drm/i915: use crtc_htotal in watermark calculations to match fastboot v2") from Linus' tree and commit 96f90c5421aa ("drm/i915: Move ILK/SNB/IVB over to the HSW

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_ddi.c between commit 76bb80ed3027 ("drm/i915/ddi: set sink to power down mode on dp disable") from Linus' tree and commit dff392dbd258 ("drm/i915: don't touch the VDD when disabling the panel")

linux-next: manual merge of the drm-intel tree with Linus' 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 7dc19d5affd7 (drivers: convert shrinkers to new count/scan API) from the tree and commit e656a6cba0fe (drm/i915: inline vma_create into lookup_or_create_vma) from the drm-intel

linux-next: manual merge of the drm-intel tree with Linus' 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 6e1b4fdad515 (drm/i915: Delay disabling of VGA memory until vgacon-fbcon handoff is done) from Linus' tree and commit eb14cb747bc5 (drm/i915: Add state readout and checking for

linux-next: manual merge of the drm-intel tree with Linus' 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 2d05eae1c92f ("drm/i915: Propagate errors back from fb set-base") and d62cf62ad07d ("drm/i915: Quirk the pipe A quirk in the modeset state checker") from Linus' tree and

linux-next: manual merge of the drm-intel tree with Linus' 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 2d05eae1c92f (drm/i915: Propagate errors back from fb set-base) and d62cf62ad07d (drm/i915: Quirk the pipe A quirk in the modeset state checker) from Linus' tree and

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_sdvo.c between commit 7ba220cec0bb ("drm/i915: Enable hotplug interrupts after querying hw capabilities") from Linus' tree and commit e596a02ccfc6 ("drm/i915: Remove dead code from SDVO

linux-next: manual merge of the drm-intel tree with Linus' 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 d62cf62ad07d ("drm/i915: Quirk the pipe A quirk in the modeset state checker") from Linus' tree and commit 6c49f24180c3 ("drm/i915: hw state readout support for

linux-next: manual merge of the drm-intel tree with Linus' 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 d62cf62ad07d (drm/i915: Quirk the pipe A quirk in the modeset state checker) from Linus' tree and commit 6c49f24180c3 (drm/i915: hw state readout support for

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_sdvo.c between commit 7ba220cec0bb (drm/i915: Enable hotplug interrupts after querying hw capabilities) from Linus' tree and commit e596a02ccfc6 (drm/i915: Remove dead code from SDVO

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_dp.c between commit 657445fe8660 ("Revert "drm/i915: revert eDP bpp clamping code changes"") from Linus' tree and commits c6bb353815c3 ("drm/i915: move dp clock computations to

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_dp.c between commit 657445fe8660 (Revert drm/i915: revert eDP bpp clamping code changes) from Linus' tree and commits c6bb353815c3 (drm/i915: move dp clock computations to encoder-compute_config),

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

Hi Daniel, On Tue, 7 May 2013 10:43:17 +0200 Daniel Vetter wrote: > > On Tue, May 7, 2013 at 3:27 AM, Stephen Rothwell > wrote: > > > > Daniel, I assume all this stuff being added to the drm-intel tree is > > going upstream very soon? > > Oops, no that is stuff for 3.11. Lazy me hoped I

linux-next: manual merge of the drm-intel tree with Linus' 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 a65851af5938 ("drm/i915: Make data/link N value power of two") from Linus' tree and commit e3b95f1eb5b9 ("drm/i915: Apply OCD to data/link m/n register #defines") from the

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

On Tue, May 7, 2013 at 3:27 AM, Stephen Rothwell wrote: > 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 a65851af5938 ("drm/i915: > Make data/link N value power of two") from Linus' tree and commit > e3b95f1eb5b9

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

Hi Daniel, On Tue, 7 May 2013 10:43:17 +0200 Daniel Vetter daniel.vet...@ffwll.ch wrote: On Tue, May 7, 2013 at 3:27 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Daniel, I assume all this stuff being added to the drm-intel tree is going upstream very soon? Oops, no that is stuff

linux-next: manual merge of the drm-intel tree with Linus' 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 a65851af5938 (drm/i915: Make data/link N value power of two) from Linus' tree and commit e3b95f1eb5b9 (drm/i915: Apply OCD to data/link m/n register #defines) from the drm-intel

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_panel.c between commit b1289371fcd5 ("Revert "drm/i915: write backlight harder"") from Linus' tree and commit 31ad8ec6a614 ("drm/i915: group backlight related stuff into a struct") from the

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

On Wed, Apr 03, 2013 at 01:43:49PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in > drivers/gpu/drm/i915/intel_panel.c between commit b1289371fcd5 ("Revert > "drm/i915: write backlight harder"") from Linus' tree and commit >

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

On Wed, Apr 03, 2013 at 01:43:49PM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_panel.c between commit b1289371fcd5 (Revert drm/i915: write backlight harder) from Linus' tree and commit 31ad8ec6a614

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_dp.c between commit 9d1a455b0ca1 ("") from Linus' tree and commit 965e0c489f36 ("drm/i915: introduce pipe_config->dither|pipe_bpp") from the drm-intel tree. I fixed it up (see below) and can carry

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_panel.c between commit b1289371fcd5 (Revert drm/i915: write backlight harder) from Linus' tree and commit 31ad8ec6a614 (drm/i915: group backlight related stuff into a struct) from the drm-intel

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_dp.c between commit 9d1a455b0ca1 () from Linus' tree and commit 965e0c489f36 (drm/i915: introduce pipe_config-dither|pipe_bpp) from the drm-intel tree. I fixed it up (see below) and can carry the

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

Hi all, Today's linux-next merge of the drm-intel tree got conflicts in drivers/gpu/drm/i915/intel_hdmi.c and drivers/gpu/drm/i915/intel_sdvo.c between commit 18316c8c39a8 ("drm: Remove duplicate drm_mode_cea_vic()") from Linus' tree and commit 4f3a8bc7ba6e ("drm/i915: rename some HDMI bit

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

Hi all, Today's linux-next merge of the drm-intel tree got conflicts in drivers/gpu/drm/i915/intel_hdmi.c and drivers/gpu/drm/i915/intel_sdvo.c between commit 18316c8c39a8 (drm: Remove duplicate drm_mode_cea_vic()) from Linus' tree and commit 4f3a8bc7ba6e (drm/i915: rename some HDMI bit