dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: DRI <dri-devel@lists.freedesktop.org>,
	Dave Airlie <airlied@linux.ie>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Cc: John Harrison <John.C.Harrison@Intel.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Matthew Brost <matthew.brost@intel.com>
Subject: Re: linux-next: manual merge of the drm tree with Linus' tree
Date: Fri, 29 Oct 2021 09:52:16 +0300	[thread overview]
Message-ID: <163549033603.4317.6416900804800927743@jlahtine-mobl.ger.corp.intel.com> (raw)
In-Reply-To: <20211029114840.6a3a78bd@canb.auug.org.au>

Quoting Stephen Rothwell (2021-10-29 03:48:40)
> Hi all,
> 
> Today's linux-next merge of the drm tree got a conflict in:
> 
>   drivers/gpu/drm/i915/i915_trace.h
> 
> between commit:
> 
>   9a4aa3a2f160 ("drm/i915: Revert 'guc_id' from i915_request tracepoint")
> 
> from Linus' tree and commit:
> 
>   3cb3e3434b9f ("drm/i915/guc: Move fields protected by guc->contexts_lock into sub structure")
> 
> from the drm tree.
> 
> I fixed it up (I used the former version) and can carry the fix as
> necessary.

The resolution for the conflict is to drop the guc_id field completely
in linux-next.

Regards, Joonas

> 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

  reply	other threads:[~2021-10-29  6:52 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-29  0:48 linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell
2021-10-29  6:52 ` Joonas Lahtinen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-04  1:08 Stephen Rothwell
2024-03-04  0:47 Stephen Rothwell
2024-01-08  0:14 Stephen Rothwell
2023-06-19  1:17 Stephen Rothwell
2022-11-30 22:57 Stephen Rothwell
2022-11-27 23:58 Stephen Rothwell
2022-11-29  9:07 ` Geert Uytterhoeven
2022-11-17  2:13 Stephen Rothwell
2022-09-19  0:58 Stephen Rothwell
2022-09-19  7:58 ` Geert Uytterhoeven
2022-09-19 14:23   ` Nathan Chancellor
2022-02-28  3:17 Stephen Rothwell
2021-10-11  0:37 Stephen Rothwell
2021-08-23  2:41 Stephen Rothwell
2021-08-24  0:12 ` Stephen Rothwell
2021-08-12  1:20 Stephen Rothwell
2021-07-01  0:52 Stephen Rothwell
2021-03-29  2:14 Stephen Rothwell
2021-03-30  7:36 ` Geert Uytterhoeven
2021-03-30 23:41   ` Stephen Rothwell
2021-02-01  1:30 Stephen Rothwell
2021-02-14 22:07 ` Stephen Rothwell
2021-01-18  0:56 Stephen Rothwell
2020-10-02  3:42 Stephen Rothwell
2020-05-25  3:51 Stephen Rothwell
2020-03-23  0:50 Stephen Rothwell
2019-11-13  1:38 Stephen Rothwell
2019-11-13  1:38 ` Stephen Rothwell
2019-11-13  1:13 Stephen Rothwell
2019-11-13  1:13 ` Stephen Rothwell
2019-11-13  0:58 Stephen Rothwell
2019-11-13  0:58 ` Stephen Rothwell
2019-11-13  0:50 Stephen Rothwell
2019-11-13  0:50 ` Stephen Rothwell
2019-11-13  0:46 Stephen Rothwell
2019-11-13  0:46 ` Stephen Rothwell
2019-11-13  0:40 Stephen Rothwell
2019-11-13  0:40 ` Stephen Rothwell
2019-08-26  3:12 Stephen Rothwell
2019-06-11  2:19 Stephen Rothwell
2018-06-04  3:09 Stephen Rothwell
2018-03-26  3:38 Stephen Rothwell
2018-03-22  6:37 Stephen Rothwell
2018-03-26  3:45 ` Stephen Rothwell
2018-03-13  1:15 Stephen Rothwell
2018-02-18 23:10 Stephen Rothwell
2018-02-20 20:15 ` Rodrigo Vivi
2018-02-18 23:02 Stephen Rothwell
2018-01-15  1:08 Stephen Rothwell
2017-11-23 23:37 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=163549033603.4317.6416900804800927743@jlahtine-mobl.ger.corp.intel.com \
    --to=joonas.lahtinen@linux.intel.com \
    --cc=John.C.Harrison@Intel.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=matthew.brost@intel.com \
    --cc=sfr@canb.auug.org.au \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).