Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
between commit:
66df9debcb29 ("drm/connector: make mode_valid_ctx take a const struct
drm_display_mode")
from the drm-misc tree and commit:
d49b485d1be3 ("drm/i915/dp_m
On Thu, 23 Jan 2025, Stephen Rothwell wrote:
> Hi all,
>
> On Wed, 8 Jan 2025 12:16:50 +1100 Stephen Rothwell
> wrote:
>>
>> On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell
>> wrote:
>> >
>> > Today's linux-next merge of the drm-intel tree got a conflict in:
>> >
>> > drivers/gpu/drm/i91
Hi all,
On Wed, 8 Jan 2025 12:16:50 +1100 Stephen Rothwell
wrote:
>
> On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the drm-intel tree got a conflict in:
> >
> > drivers/gpu/drm/i915/display/intel_display_driver.c
> >
> > between commit:
>
On Wed, Jan 08, 2025 at 12:16:50PM +1100, Stephen Rothwell wrote:
> Hi All,
>
> On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the drm-intel tree got a conflict in:
> >
> > drivers/gpu/drm/i915/display/intel_display_driver.c
> >
> > between co
Hi All,
On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_display_driver.c
>
> between commit:
>
> 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm
> dir
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_display_driver.c
between commit:
4fc0cee83590 ("drivers: remove get_task_comm() and print task comm directly")
from the mm-nonmm-unstable branch of the mm tree and commit:
f5d38d
[Thanks, Imre for the heads up and help with the conflict resolution]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
between commit:
6fe7b1d10cbd ("drm/i915/dp_mst: Expose a connector to kernel users after it's
properl
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/xe/display/xe_display.c
between commit:
a4de6beb83fc ("drm/xe/display: Separate the d3cold and non-d3cold runtime PM
handling")
from Linus' tree and commit:
f5d38d4fa884 ("drm/i915/display: conver
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dsb.c
between commit:
ebd1e5faa72af ("drm/i915/dsb: Don't use indexed register writes needlessly")
from the drm-intel-fixes tree and commit:
ecba559a88ab8 ("drm/i915/dsb: Don't u
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 work
Hi all,
On Mon, 20 Nov 2023 12:28:18 +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_mst_types.c
>
> between commits:
>
> a58555359a9f ("drm/amd/display: Fix DSC not Enabled on Direct
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")
>
>
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 divi
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_mst_types.c
between commits:
a58555359a9f ("drm/amd/display: Fix DSC not Enabled on Direct MST Sink")
c29085d29562 ("drm/amd/display: Enable DSC Flag in MST Mode Valid
On Tue, 03 Oct 2023, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_drv.h
>
> between commits:
>
> c9517783060a ("drm/i915/dg2: Drop Wa_16011777198")
> 5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_ST
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/i915_drv.h
between commits:
c9517783060a ("drm/i915/dg2: Drop Wa_16011777198")
5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_STEP")
81af8abe6513 ("drm/i915: Eliminate IS_MTL_MEDIA_STEP")
Hi all,
On Tue, 30 May 2023 11:57:52 +1000 Stephen Rothwell
wrote:
>
> @@@ -920,33 -587,8 +640,9 @@@ static const struct intel_device_info j
> #define GEN12_FEATURES \
> GEN11_FEATURES, \
> GEN(12), \
> - .display.abox_mask = GENMASK(2, 1), \
> - .__runtime.pipe_mask = BIT(
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:
66ca1d8f222b ("drm/i915/i915_drv: Use i915 instead of dev_priv insied the
file_priv structure")
from the drm tree and commits:
5af5169d7582 ("drm/i915: Convert INTE
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:
5e352e32aec2 ("drm/i915: preparation for using PAT index")
from the drm tree and commits:
5af5169d7582 ("drm/i915: Convert INTEL_INFO()->display to a pointer")
18e
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")
f
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:
f67986b0119c ("drm/i915/pxp: Promote pxp subsystem to top-level of i915")
from the drm tree and commit:
a3f839762ceb ("drm/i915: move pch_ssc_use to display sub-stru
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,
>
> >>
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:
dr
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
>>>
>>> betw
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
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 us
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:
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 alias
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:
3bb6a44251b4 ("drm/i915: Rename ggtt_view as gtt_view")
from the drm tree and commit:
5fd5cc73e449 ("drm/i915: split out i915_gem.c declarations to i915_gem.h")
fro
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:
254e5e8829a9 ("drm: Remove unnecessary include statements of
drm_plane_helper.h")
from the drm tree and commit:
42a0d256496f ("drm/i915: Extract skl_watermark.c")
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 multipl
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: Ad
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")
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 ("drm/i9
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: P
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
between commit:
721fd84ea1fe9 ("drm/i915/pmu: Use PM timestamp instead of RING TIMESTAMP for
reference")
from the drm-intel-gt tree and commit:
b3f74938d6566 ("dr
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:
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/i915_module.c
between commit:
6387a3c4b0c4 ("drm: move the buddy allocator from i915 into common drm")
from the drm tree and commit:
24524e3f43cf ("drm/i915: move the DRIVER_* macros to i915_d
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
include/linux/dma-buf-map.h
between commit:
e8c1f36157ce ("dma-buf-map: Fix dot vs comma in example")
from the drm tree and commit:
7938f4218168 ("dma-buf-map: Rename to iosys-map")
from the drm-intel tree.
I fi
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 [mor
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 t
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
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:
3ffe82d701a4 ("drm/i915/xehp: handle new steering options")
from the drm tree and commit:
22e26af76903 ("drm/i915: Fork DG1 interrupt handler")
from the dr
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: r
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 registers"
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 an
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 the
Hi
Am 14.05.21 um 03:53 schrieb Stephen Rothwell:
Hi all,
On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell
wrote:
On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell
wrote:
On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell
wrote:
Today's linux-next merge of the drm-intel tree g
Hi all,
On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell
wrote:
>
> On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell
> wrote:
> >
> > On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell
> > wrote:
> > >
> > > Today's linux-next merge of the drm-intel tree got a conflict in:
> > >
>
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
Hi all,
On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell
wrote:
>
> On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the drm-intel tree got a conflict in:
> >
> > drivers/gpu/drm/i915/display/intel_sprite.c
> >
> > between commit:
> >
>
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:
1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane")
from the drm tree and commit:
61169987c4d9 ("drm/i915: Unify the FB and plane state
Hi all,
On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_sprite.c
>
> between commit:
>
> 92f1d09ca4ed ("drm: Switch to %p4cc format modifier")
>
> from the drm tree and
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_sprite.c
between commit:
92f1d09ca4ed ("drm: Switch to %p4cc format modifier")
from the drm tree and commit:
46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")
fro
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/gem/i915_gem_object.h
between commit:
41a9c75d0acf ("drm/i915/gem: Move stolen node into GEM object union")
from the drm tree and commit:
5fbc2c2bfa5c ("drm/i915/gem: Add a helper to read data
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:
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 ("drm/
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")
fr
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: panel
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/drm_probe_helper.c
between commit:
12c683e12cd8 ("drm: bridge: Pass drm_display_info to drm_bridge_funcs
.mode_valid()")
from the drm tree and commit:
1c26b8e09004 ("drm/probe_helper: Add
drm_con
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")
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: Identify
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 drm
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")
>
> fro
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* d
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/i915_vma.c
between commit:
52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv")
from the drm tree and commit:
cd2a4eaf8c79 ("drm/i915: Report resv_obj allocation failure")
from the
Hi all,
On Tue, 23 Jul 2019 11:03:31 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_dp.c
>
> between commit:
>
> b6ac32eac063 ("drm/i915: Mark expected switch fall-throughs")
This is now commit
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:
b6ac32eac063 ("drm/i915: Mark expected switch fall-throughs")
from the kspp-gustavo tree and commit:
bc85328ff431 ("drm/i915: Move the TypeC port handling co
Hi all,
On Mon, 24 Jun 2019 13:53:52 +1000 Stephen Rothwell
wrote:
>
> On Mon, 17 Jun 2019 13:20:27 +1000 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the drm-intel tree got a conflict in:
> >
> > drivers/gpu/drm/i915/i915_drv.h
> >
> > between commit:
> >
> > 151f4e2bd
Hi all,
On Mon, 17 Jun 2019 13:20:27 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_drv.h
>
> between commit:
>
> 151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
>
> from the pci tre
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:
151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
from the pci tree and commit:
1bf676cc2dba ("drm/i915: move and rename i915_runtime_pm")
from
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 ("drm/i91
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
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 BIT(
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:
fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
from the drm tree and commit:
5f5c139d6900 ("drm/i915: Allocate active tracking nodes from a slabcache")
from the
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:
dd847a706974 ("drm/i915: Compile fix for 64b dma-fence seqno")
from the drm tree and commit:
9f58892ea996 ("drm/i915: Pull all the reset functionality together into
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:
> >
> > fa3dd623e559 ("d
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")
>
> from Linus' tree and c
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 pinn
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
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: In
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 drm-intel-fixes tree a
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
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 stop_mac
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 ("drm/i9
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 sg_al
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
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)
fr
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_dp_mst.c
between commit:
f424f55e3177 ("drm/i915: Track MST link bandwidth")
from the drm tree and commit:
3d65a735d834 ("drm/i915/mst: use max link not sink lane count")
from the drm-i
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 i915_add_reque
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 ("drm/i91
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 fo
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
include/drm/drmP.h
between commit:
c4e68a583202 ("drm: Introduce DRM_DEV_* log messages")
from the drm tree and commit:
30b0da8d556e ("drm: extra printk() wrapper macros")
from the drm-intel tree.
I fixed it up
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 oth
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 to
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 drm-intel
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 dur
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 regi
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' 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 WaRsDisableCoarsePowerGati
1 - 100 of 192 matches
Mail list logo
