linux-next: manual merge of the drm-misc tree with Linus' tree

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>
Cc: Alexandr Sapozhnikov <alsp705@gmail.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>
Subject: linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Tue, 14 Mar 2023 11:19:11 +1100	[thread overview]
Message-ID: <20230314111911.62a3e636@canb.auug.org.au> (raw)

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

Hi all,

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

  drivers/gpu/drm/tiny/cirrus.c

between commit:

  7245e629dcaa ("drm/cirrus: NULL-check pipe->plane.state->fb in cirrus_pipe_update()")

from Linus' tree and commits:

  d99c028941b3 ("drm/cirrus: Convert to regular atomic helpers")
  03e7ac67e743 ("drm/cirrus: Enable damage clipping on primary plane")

from the drm-misc tree.

I fixed it up (I just used the latter version) 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 (diff)

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>
Cc: Alexandr Sapozhnikov <alsp705@gmail.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>
Subject: linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Tue, 14 Mar 2023 11:19:11 +1100	[thread overview]
Message-ID: <20230314111911.62a3e636@canb.auug.org.au> (raw)

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

Hi all,

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

  drivers/gpu/drm/tiny/cirrus.c

between commit:

  7245e629dcaa ("drm/cirrus: NULL-check pipe->plane.state->fb in cirrus_pipe_update()")

from Linus' tree and commits:

  d99c028941b3 ("drm/cirrus: Convert to regular atomic helpers")
  03e7ac67e743 ("drm/cirrus: Enable damage clipping on primary plane")

from the drm-misc tree.

I fixed it up (I just used the latter version) 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 (diff)

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>
Cc: Alexandr Sapozhnikov <alsp705@gmail.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>
Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Tue, 14 Mar 2023 11:19:11 +1100	[thread overview]
Message-ID: <20230314111911.62a3e636@canb.auug.org.au> (raw)

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

Hi all,

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

  drivers/gpu/drm/tiny/cirrus.c

between commit:

  7245e629dcaa ("drm/cirrus: NULL-check pipe->plane.state->fb in cirrus_pipe_update()")

from Linus' tree and commits:

  d99c028941b3 ("drm/cirrus: Convert to regular atomic helpers")
  03e7ac67e743 ("drm/cirrus: Enable damage clipping on primary plane")

from the drm-misc tree.

I fixed it up (I just used the latter version) 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 --]

next             reply	other threads:[~2023-03-14  0:19 UTC|newest]

Thread overview: 120+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-14  0:19 Stephen Rothwell [this message]
2023-03-14  0:19 ` [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell
2023-03-14  0:19 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-03-25 23:29 Stephen Rothwell
2024-02-06  0:59 Stephen Rothwell
2024-02-06  1:06 ` Stephen Rothwell
2024-02-06 11:28   ` Michael Walle
2024-02-06 11:34     ` Dario Binacchi
2023-11-14  0:42 Stephen Rothwell
2023-11-14  0:42 ` Stephen Rothwell
2023-11-14  0:36 Stephen Rothwell
2023-11-14  0:36 ` Stephen Rothwell
2023-11-14  0:31 Stephen Rothwell
2023-11-14  0:31 ` Stephen Rothwell
2023-11-14  0:25 Stephen Rothwell
2023-11-14  0:25 ` Stephen Rothwell
2023-09-25  1:41 Stephen Rothwell
2023-09-25  1:41 ` Stephen Rothwell
2023-09-20  1:12 Stephen Rothwell
2023-09-20  1:12 ` Stephen Rothwell
2023-09-13  1:09 Stephen Rothwell
2023-09-13  1:09 ` Stephen Rothwell
2023-09-13  9:04 ` Uwe Kleine-König
2023-09-13  9:04   ` Uwe Kleine-König
2023-07-12 23:58 Stephen Rothwell
2023-07-12 23:58 ` Stephen Rothwell
2023-05-23  0:43 Stephen Rothwell
2023-05-23  0:43 ` Stephen Rothwell
2023-05-15  1:14 Stephen Rothwell
2023-05-15  1:14 ` Stephen Rothwell
2023-01-19  1:13 Stephen Rothwell
2023-01-19  1:13 ` Stephen Rothwell
2023-01-05 23:50 Stephen Rothwell
2023-01-05 23:50 ` Stephen Rothwell
2022-11-03 23:15 Stephen Rothwell
2022-11-03 23:15 ` Stephen Rothwell
2022-10-05  0:43 Stephen Rothwell
2022-10-05  0:43 ` Stephen Rothwell
2022-06-29  1:06 Stephen Rothwell
2022-06-29  1:06 ` Stephen Rothwell
2022-06-10  0:44 Stephen Rothwell
2022-06-10  0:44 ` Stephen Rothwell
2021-11-16 22:29 Stephen Rothwell
2021-11-16 22:29 ` Stephen Rothwell
2021-10-28  2:48 Stephen Rothwell
2021-01-21  1:24 Stephen Rothwell
2021-01-21  1:24 ` Stephen Rothwell
2020-10-27  1:26 Stephen Rothwell
2020-10-27  1:26 ` Stephen Rothwell
2020-10-27  1:20 Stephen Rothwell
2020-10-27  1:20 ` Stephen Rothwell
2020-10-27  1:16 Stephen Rothwell
2020-10-27  1:16 ` Stephen Rothwell
2020-08-26  0:01 Stephen Rothwell
2020-08-26  0:01 ` Stephen Rothwell
2020-09-02  3:11 ` Stephen Rothwell
2020-09-02  3:11   ` Stephen Rothwell
2020-06-29  1:14 Stephen Rothwell
2020-06-29  1:14 ` Stephen Rothwell
2020-06-26  1:43 Stephen Rothwell
2020-06-26  1:43 ` Stephen Rothwell
2020-06-17  0:46 Stephen Rothwell
2020-06-17  0:46 ` Stephen Rothwell
2020-04-16  1:25 Stephen Rothwell
2020-04-16  1:25 ` Stephen Rothwell
2020-04-15  1:46 Stephen Rothwell
2020-04-15  1:46 ` Stephen Rothwell
2019-12-16  0:51 Stephen Rothwell
2019-12-16  0:51 ` Stephen Rothwell
2019-12-16  0:46 Stephen Rothwell
2019-12-16  0:46 ` Stephen Rothwell
2019-05-21  0:51 Stephen Rothwell
2019-05-23  0:27 ` Stephen Rothwell
2019-05-23  8:10 ` Maxime Ripard
2019-05-23  9:34   ` Stephen Rothwell
2019-05-23 11:53 ` Maxime Ripard
2019-05-23 11:53   ` Maxime Ripard
2019-05-23 13:04   ` Stephen Rothwell
2019-05-23 13:11     ` Daniel Vetter
2019-05-23 14:16       ` Stephen Rothwell
2019-05-23 14:16         ` Stephen Rothwell
2019-05-23 16:10   ` Rob Herring
2019-05-23 16:10     ` Rob Herring
2019-05-24  7:12     ` Maxime Ripard
2019-05-24  7:12       ` Maxime Ripard
2019-01-11  0:14 Stephen Rothwell
2018-03-20  1:08 Stephen Rothwell
2018-03-23  0:43 ` Stephen Rothwell
2018-03-23  0:43   ` Stephen Rothwell
2018-03-15  3:14 Stephen Rothwell
2018-03-15  3:14 ` Stephen Rothwell
2018-03-23  0:45 ` Stephen Rothwell
2018-03-23  0:45   ` Stephen Rothwell
2017-09-22  2:24 Stephen Rothwell
2017-08-02  2:23 Stephen Rothwell
2017-08-02  2:23 ` Stephen Rothwell
2017-08-10  2:06 ` Stephen Rothwell
2017-08-10  2:06   ` Stephen Rothwell
2017-07-19  1:30 Stephen Rothwell
2016-09-23  1:35 Stephen Rothwell
2016-06-07  1:32 Stephen Rothwell
2016-06-07  1:32 ` Stephen Rothwell
2016-03-31  0:15 Stephen Rothwell
2016-03-31  0:15 ` Stephen Rothwell
2016-03-29 23:49 Stephen Rothwell
2016-03-29 23:49 ` Stephen Rothwell
2015-12-16  0:38 Stephen Rothwell
2015-12-16  0:38 ` Stephen Rothwell
2015-12-14  1:12 Stephen Rothwell
2015-12-14  1:12 ` Stephen Rothwell
2015-12-14  7:09 ` Thomas Hellstrom
2015-12-14  7:09   ` Thomas Hellstrom
2015-09-12  3:15 Stephen Rothwell
2015-09-12  3:15 ` Stephen Rothwell
2015-08-14  2:06 Stephen Rothwell
2015-08-14  2:06 ` Stephen Rothwell
2015-08-03  2:11 Stephen Rothwell
2015-08-03  2:11 ` Stephen Rothwell
2015-07-30  3:04 Stephen Rothwell
2015-07-30  3:04 ` 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=20230314111911.62a3e636@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alsp705@gmail.com \
    --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=tzimmermann@suse.de \
    /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.