public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the drm-misc tree with the drm tree
@ 2019-06-11  3:52 Stephen Rothwell
  2019-06-11  3:59 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-06-11  3:52 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI, Dave Airlie
  Cc: Linux Next Mailing List, Sam Ravnborg, Linux Kernel Mailing List


[-- Attachment #1.1: Type: text/plain, Size: 1674 bytes --]

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c

between commit:

  9b93eb475aa9 ("drm/amd/display: move clk_mgr files to right place")

from the drm tree and commit:

  4fc4dca8320e ("drm/amd: drop use of drmp.h in os_types.h")

from the drm-misc tree.

I fixed it up (I deleted the file and added the following patch) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

I am not sure if this is actually needed but it seemed prudent with the
addition of the kzalloc/kfree calls in this file.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Jun 2019 13:48:08 +1000
Subject: [PATCH] drm/amd/display: merge fix for "drm/amd: drop use of drmp.h in os_types.h"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
index eb2204d42337..cb3f6a74d9e3 100644
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dal_asic_id.h"
 #include "dc_types.h"
 #include "dccg.h"
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-06-12  9:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-11  3:52 linux-next: manual merge of the drm-misc tree with the drm tree Stephen Rothwell
2019-06-11  3:59 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-06-11  4:25 ` ✓ Fi.CI.BAT: success " Patchwork
2019-06-12  9:33 ` ✓ Fi.CI.IGT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox