From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [Intel-xe] [PATCH] Revert "drm/i915: define I915 during i915 driver build"
Date: Mon, 2 Oct 2023 10:41:19 -0400 [thread overview]
Message-ID: <ZRrWj8NXTI9q0Ibc@intel.com> (raw)
In-Reply-To: <20231002092402.1826859-1-jani.nikula@intel.com>
On Mon, Oct 02, 2023 at 12:24:02PM +0300, Jani Nikula wrote:
> This reverts commit 12b98dd1eb4f2ec852dce19a01a76bf43a39bbee.
>
> We already have commit a4ba1ea69f6b ("drm/i915: define I915 during i915
> driver build") in the baseline. It defines I915 at a slightly different
> place from this, so there was no conflict. This can be dropped.
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
good catch. I pushed the revert here and in a next force-push I will
remove the original and this revert.
> ---
> drivers/gpu/drm/i915/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 911dfb92a8c1..dec78efa452a 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -12,7 +12,7 @@
> # Note the danger in using -Wall -Wextra is that when CI updates gcc we
> # will most likely get a sudden build breakage... Hopefully we will fix
> # new warnings before CI updates!
> -subdir-ccflags-y := -Wall -Wextra -DI915
> +subdir-ccflags-y := -Wall -Wextra
> subdir-ccflags-y += -Wno-format-security
> subdir-ccflags-y += -Wno-unused-parameter
> subdir-ccflags-y += -Wno-type-limits
> --
> 2.39.2
>
prev parent reply other threads:[~2023-10-02 14:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 9:24 [Intel-xe] [PATCH] Revert "drm/i915: define I915 during i915 driver build" Jani Nikula
2023-10-02 9:27 ` [Intel-xe] ✓ CI.Patch_applied: success for " Patchwork
2023-10-02 9:27 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-10-02 9:28 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-10-02 9:35 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-10-02 9:36 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-10-02 9:37 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-10-02 10:14 ` [Intel-xe] ✗ CI.BAT: failure " Patchwork
2023-10-02 11:48 ` [Intel-xe] ✓ CI.Patch_applied: success for Revert "drm/i915: define I915 during i915 driver build" (rev2) Patchwork
2023-10-02 11:48 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-10-02 11:49 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-10-02 11:56 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-10-02 11:57 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-10-02 11:58 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-10-02 14:41 ` Rodrigo Vivi [this message]
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=ZRrWj8NXTI9q0Ibc@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/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.