All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
	Dave Airlie <airlied@linux.ie>,
	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>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Wed, 22 Jul 2020 14:34:17 +1000	[thread overview]
Message-ID: <20200722143417.42b52c73@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

Hi all,

[I can't find a previous email about this, sorry ...]

There is a semantic conflict between Linus' tree and the amdgpu tree
between commit

  d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")

from Linus' tree and commts

  fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")
  836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for renoir")

The automted git merge leaves two "case 12" labels.  I have been
reverting commit d7a6634a4cfb since July 3 ... This will need to be
fixed up when the amdgpu tree is next merged into the drm tree, or a back
merge of d7a6634a4cfb could be done into the amdgpu tree and the older
"case 12" label removed in that merge.

-- 
Cheers,
Stephen Rothwell

[-- 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: Alex Deucher <alexdeucher@gmail.com>,
	Dave Airlie <airlied@linux.ie>,
	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>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Wed, 22 Jul 2020 14:34:17 +1000	[thread overview]
Message-ID: <20200722143417.42b52c73@canb.auug.org.au> (raw)


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

Hi all,

[I can't find a previous email about this, sorry ...]

There is a semantic conflict between Linus' tree and the amdgpu tree
between commit

  d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")

from Linus' tree and commts

  fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")
  836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for renoir")

The automted git merge leaves two "case 12" labels.  I have been
reverting commit d7a6634a4cfb since July 3 ... This will need to be
fixed up when the amdgpu tree is next merged into the drm tree, or a back
merge of d7a6634a4cfb could be done into the amdgpu tree and the older
"case 12" label removed in that merge.

-- 
Cheers,
Stephen Rothwell

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

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

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

             reply	other threads:[~2020-07-22  4:34 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22  4:34 Stephen Rothwell [this message]
2020-07-22  4:34 ` linux-next: manual merge of the amdgpu tree with Linus' tree Stephen Rothwell
2020-07-23  8:01 ` Daniel Vetter
2020-07-23  8:01   ` Daniel Vetter
2020-07-23 13:34   ` Alex Deucher
2020-07-23 13:34     ` Alex Deucher
  -- strict thread matches above, loose matches on Subject: below --
2023-11-05 22:48 Stephen Rothwell
2023-11-06 23:49 ` Stephen Rothwell
2023-11-06 23:49   ` Stephen Rothwell
2023-07-24  1:14 Stephen Rothwell
2023-05-12  0:38 Stephen Rothwell
2023-05-12  0:38 ` Stephen Rothwell
2022-07-19  2:00 Stephen Rothwell
2022-01-26 23:32 Stephen Rothwell
2022-01-26 23:29 Stephen Rothwell
2022-01-11 23:09 Stephen Rothwell
2021-09-02  1:22 Stephen Rothwell
2021-09-10  1:16 ` Stephen Rothwell
2021-08-02 15:10 Mark Brown
2021-08-02 15:48 ` Mark Brown
2021-07-06  0:52 Stephen Rothwell
2021-01-15  0:53 Stephen Rothwell
2021-01-08  1:04 Stephen Rothwell
2020-11-03  3:10 Stephen Rothwell
2020-10-27  0:48 Stephen Rothwell
2020-10-27  0:48 ` Stephen Rothwell
2020-10-16  1:48 Stephen Rothwell
2020-08-25  1:35 Stephen Rothwell
2019-12-12  0:03 Stephen Rothwell
2019-12-12  0:11 ` Stephen Rothwell
2019-12-12  0:16 ` Timothy Pearson
2019-12-11 23:37 Stephen Rothwell
2019-12-12  0:10 ` Stephen Rothwell
2019-10-28  1:11 Stephen Rothwell
2019-10-28  1:03 Stephen Rothwell
2019-10-28  0:57 Stephen Rothwell
2019-10-28  1:13 ` Masahiro Yamada
2019-10-03  0:19 Stephen Rothwell
2019-06-17  3:12 Stephen Rothwell
2019-03-18 23:55 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=20200722143417.42b52c73@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=alexdeucher@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.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.