From: Stephen Rothwell <sfr@canb.auug.org.au> To: Lucas Stach <l.stach@pengutronix.de>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: "Linux Next Mailing List" <linux-next@vger.kernel.org>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Christian König" <christian.koenig@amd.com>, "Sam Ravnborg" <sam@ravnborg.org> Subject: linux-next: manual merge of the etnaviv tree with the drm-misc tree Date: Wed, 14 Aug 2019 13:20:52 +1000 [thread overview] Message-ID: <20190814132052.6a948fec@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1456 bytes --] Hi all, Today's linux-next merge of the etnaviv tree got a conflict in: drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c between commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm-misc tree and commit: 6eae41fea750 ("drm/etnaviv: drop use of drmP.h") 2e737e520548 ("drm/etnaviv: clean up includes") from the etnaviv tree. I fixed it up (see below) 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index 998c96b40d8a,f535a627f297..000000000000 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@@ -3,9 -3,15 +3,15 @@@ * Copyright (C) 2015 Etnaviv Project */ + #include <drm/drm_file.h> #include <linux/dma-fence-array.h> + #include <linux/file.h> + #include <linux/pm_runtime.h> -#include <linux/reservation.h> +#include <linux/dma-resv.h> #include <linux/sync_file.h> + #include <linux/uaccess.h> + #include <linux/vmalloc.h> + #include "etnaviv_cmdbuf.h" #include "etnaviv_drv.h" #include "etnaviv_gpu.h" [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Lucas Stach <l.stach@pengutronix.de>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: "Linux Next Mailing List" <linux-next@vger.kernel.org>, "Sam Ravnborg" <sam@ravnborg.org>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Christian König" <christian.koenig@amd.com> Subject: linux-next: manual merge of the etnaviv tree with the drm-misc tree Date: Wed, 14 Aug 2019 13:20:52 +1000 [thread overview] Message-ID: <20190814132052.6a948fec@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 1456 bytes --] Hi all, Today's linux-next merge of the etnaviv tree got a conflict in: drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c between commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm-misc tree and commit: 6eae41fea750 ("drm/etnaviv: drop use of drmP.h") 2e737e520548 ("drm/etnaviv: clean up includes") from the etnaviv tree. I fixed it up (see below) 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index 998c96b40d8a,f535a627f297..000000000000 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@@ -3,9 -3,15 +3,15 @@@ * Copyright (C) 2015 Etnaviv Project */ + #include <drm/drm_file.h> #include <linux/dma-fence-array.h> + #include <linux/file.h> + #include <linux/pm_runtime.h> -#include <linux/reservation.h> +#include <linux/dma-resv.h> #include <linux/sync_file.h> + #include <linux/uaccess.h> + #include <linux/vmalloc.h> + #include "etnaviv_cmdbuf.h" #include "etnaviv_drv.h" #include "etnaviv_gpu.h" [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2019-08-14 3:20 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-14 3:20 Stephen Rothwell [this message] 2019-08-14 3:20 ` linux-next: manual merge of the etnaviv tree with the drm-misc tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2018-11-26 2:58 Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190814132052.6a948fec@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=christian.koenig@amd.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=l.stach@pengutronix.de \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=sam@ravnborg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.