From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for dma-buf: fix build due to missing export
Date: Fri, 4 Jun 2021 22:44:54 -0700 [thread overview]
Message-ID: <20210605054454.432wxsd5xu4cloen@ldmartin-desk2> (raw)
In-Reply-To: <162285301816.31069.14470638938169728375@emeril.freedesktop.org>
This patch is intended for drm-misc, where the issue comes from.
Lucas De Marchi
On Sat, Jun 05, 2021 at 12:30:18AM +0000, Patchwork wrote:
>== Series Details ==
>
>Series: dma-buf: fix build due to missing export
>URL : https://patchwork.freedesktop.org/series/91045/
>State : failure
>
>== Summary ==
>
>Applying: dma-buf: fix build due to missing export
>Using index info to reconstruct a base tree...
>M drivers/dma-buf/dma-resv.c
>Falling back to patching base and 3-way merge...
>Auto-merging drivers/dma-buf/dma-resv.c
>CONFLICT (content): Merge conflict in drivers/dma-buf/dma-resv.c
>error: Failed to merge in the changes.
>hint: Use 'git am --show-current-patch=diff' to see the failed patch
>Patch failed at 0001 dma-buf: fix build due to missing export
>When you have resolved this problem, run "git am --continue".
>If you prefer to skip this patch, run "git am --skip" instead.
>To restore the original branch and stop patching, run "git am --abort".
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-06-05 5:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 0:20 [PATCH] dma-buf: fix build due to missing export Lucas De Marchi
2021-06-05 0:20 ` [Intel-gfx] " Lucas De Marchi
2021-06-05 0:20 ` Lucas De Marchi
2021-06-05 0:30 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2021-06-05 5:44 ` Lucas De Marchi [this message]
2021-06-05 7:13 ` [PATCH] " kernel test robot
2021-06-05 7:13 ` kernel test robot
2021-06-05 7:13 ` [Intel-gfx] " kernel test robot
2021-06-05 7:13 ` kernel test robot
2021-06-05 11:14 ` Christian König
2021-06-05 11:14 ` [Intel-gfx] " Christian König
2021-06-05 11:14 ` Christian König
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=20210605054454.432wxsd5xu4cloen@ldmartin-desk2 \
--to=lucas.demarchi@intel.com \
--cc=intel-gfx@lists.freedesktop.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: link
Be 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.