All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>,
	DRI <dri-devel@lists.freedesktop.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Maxime Ripard <maxime@cerno.tech>
Subject: linux-next: manual merge of the drm-misc-fixes tree with Linus' tree
Date: Mon, 20 Sep 2021 09:07:29 +1000	[thread overview]
Message-ID: <20210920090729.19458953@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the drm-misc-fixes tree got a conflict in:

  drivers/gpu/drm/vc4/vc4_hdmi.c

between commit:

  b1044a9b8100 ("Revert drm/vc4 hdmi runtime PM changes")

from Linus' tree and commits:

  36e9bcb8edfc ("drm/vc4: select PM")
  a22dad7fa0cd ("drm/vc4: hdmi: Rework the pre_crtc_configure error handling")

from the drm-misc-fixes tree.

I fixed it up (I just effectively reverted the change in Linus' tree) 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

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

WARNING: multiple messages have this Message-ID
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>,
	DRI <dri-devel@lists.freedesktop.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Maxime Ripard <maxime@cerno.tech>
Subject: [Intel-gfx] linux-next: manual merge of the drm-misc-fixes tree with Linus' tree
Date: Mon, 20 Sep 2021 09:07:29 +1000	[thread overview]
Message-ID: <20210920090729.19458953@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the drm-misc-fixes tree got a conflict in:

  drivers/gpu/drm/vc4/vc4_hdmi.c

between commit:

  b1044a9b8100 ("Revert drm/vc4 hdmi runtime PM changes")

from Linus' tree and commits:

  36e9bcb8edfc ("drm/vc4: select PM")
  a22dad7fa0cd ("drm/vc4: hdmi: Rework the pre_crtc_configure error handling")

from the drm-misc-fixes tree.

I fixed it up (I just effectively reverted the change in Linus' tree) 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

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

             reply	other threads:[~2021-09-19 23:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-19 23:07 Stephen Rothwell [this message]
2021-09-19 23:07 ` [Intel-gfx] linux-next: manual merge of the drm-misc-fixes tree with Linus' tree 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=20210920090729.19458953@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maxime@cerno.tech \
    --cc=torvalds@linux-foundation.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.