From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Dave Airlie <airlied@gmail.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Sean Paul <sean@poorly.run>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
"DRM maintainer tools announcements, discussion,
and development" <dim-tools@lists.freedesktop.org>
Subject: Re: [PULL] drm-misc-fixes
Date: Thu, 9 Sep 2021 11:30:18 +0200 [thread overview]
Message-ID: <CAKMK7uEZv_YztMn5j0TWsakrRNdXk_ST3SUJRc_SVy08-THHSQ@mail.gmail.com> (raw)
In-Reply-To: <CAPM=9twpHCGLh3nYeTF69woSFWpuWUT+Zk48YyOX3zzNLFLw+g@mail.gmail.com>
On Thu, Sep 9, 2021 at 5:35 AM Dave Airlie <airlied@gmail.com> wrote:
>
> On Thu, 9 Sept 2021 at 03:44, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> >
> > Hi Dave and Daniel,
> >
> > here's this week's PR for drm-misc-fixes. One patch is a potential deadlock
> > in TTM, the other enables an additional plane in kmb. I'm slightly unhappy
> > that the latter one ended up in -fixes as it's not a bugfix AFAICT.
>
> To avoid messy merge window, I'm not pulling this until after rc1
> unless there is some major reason?
Christian misplaced a ttm fix, so we really want this. Maybe
cherry-pick to drm-next and then drm-misc-fixes gets rebased instead.
And yeah I dunno what do with our conflicts around merge window, maybe
we're letting trees diverge a bit too much.
-Daniel
>
> the current drm-next doesn't have v5.14 in it, and the merge is rather
> ugly right now.
>
> (maybe I should always pull it in before sending to Linus to avoid
> this in future).
>
> Dave.
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Dave Airlie <airlied@gmail.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Sean Paul <sean@poorly.run>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
"DRM maintainer tools announcements, discussion,
and development" <dim-tools@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PULL] drm-misc-fixes
Date: Thu, 9 Sep 2021 11:30:18 +0200 [thread overview]
Message-ID: <CAKMK7uEZv_YztMn5j0TWsakrRNdXk_ST3SUJRc_SVy08-THHSQ@mail.gmail.com> (raw)
In-Reply-To: <CAPM=9twpHCGLh3nYeTF69woSFWpuWUT+Zk48YyOX3zzNLFLw+g@mail.gmail.com>
On Thu, Sep 9, 2021 at 5:35 AM Dave Airlie <airlied@gmail.com> wrote:
>
> On Thu, 9 Sept 2021 at 03:44, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> >
> > Hi Dave and Daniel,
> >
> > here's this week's PR for drm-misc-fixes. One patch is a potential deadlock
> > in TTM, the other enables an additional plane in kmb. I'm slightly unhappy
> > that the latter one ended up in -fixes as it's not a bugfix AFAICT.
>
> To avoid messy merge window, I'm not pulling this until after rc1
> unless there is some major reason?
Christian misplaced a ttm fix, so we really want this. Maybe
cherry-pick to drm-next and then drm-misc-fixes gets rebased instead.
And yeah I dunno what do with our conflicts around merge window, maybe
we're letting trees diverge a bit too much.
-Daniel
>
> the current drm-next doesn't have v5.14 in it, and the merge is rather
> ugly right now.
>
> (maybe I should always pull it in before sending to Linus to avoid
> this in future).
>
> Dave.
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2021-09-09 9:30 UTC|newest]
Thread overview: 330+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 17:44 [PULL] drm-misc-fixes Thomas Zimmermann
2021-09-08 17:44 ` [Intel-gfx] " Thomas Zimmermann
2021-09-09 3:35 ` Dave Airlie
2021-09-09 3:35 ` [Intel-gfx] " Dave Airlie
2021-09-09 9:30 ` Daniel Vetter [this message]
2021-09-09 9:30 ` Daniel Vetter
2021-09-10 6:20 ` Dave Airlie
2021-09-10 6:20 ` [Intel-gfx] " Dave Airlie
-- strict thread matches above, loose matches on Subject: below --
2024-05-10 7:20 Thomas Zimmermann
2024-05-02 19:21 Thomas Zimmermann
2024-04-25 10:24 Thomas Zimmermann
2024-04-18 7:22 Thomas Zimmermann
2024-04-11 7:34 Thomas Zimmermann
2024-04-04 10:48 Thomas Zimmermann
2024-03-28 13:44 Thomas Zimmermann
2024-03-07 8:44 Maxime Ripard
2024-02-29 13:37 Maxime Ripard
2024-02-29 13:54 ` Matthew Auld
2024-03-06 14:26 ` Maxime Ripard
2024-02-22 17:48 Maxime Ripard
2024-02-15 8:49 Maxime Ripard
2024-02-15 12:41 ` Geert Uytterhoeven
2024-02-08 12:02 Maxime Ripard
2024-02-01 9:52 Maxime Ripard
2024-02-01 9:52 ` Maxime Ripard
2024-01-26 11:44 Maxime Ripard
2024-01-26 11:44 ` Maxime Ripard
2024-01-03 10:47 Maarten Lankhorst
2024-01-03 10:47 ` Maarten Lankhorst
2023-12-14 9:34 Maarten Lankhorst
2023-12-14 9:34 ` Maarten Lankhorst
2023-12-07 12:43 Maarten Lankhorst
2023-12-07 12:43 ` Maarten Lankhorst
2023-11-29 19:51 Maarten Lankhorst
2023-11-23 12:22 Maarten Lankhorst
2023-11-16 13:48 Maarten Lankhorst
2023-11-17 10:45 ` Daniel Vetter
2023-11-08 13:18 Maarten Lankhorst
2023-11-10 20:33 ` Daniel Vetter
2023-11-02 13:00 Thomas Zimmermann
2023-10-26 11:01 Thomas Zimmermann
2023-10-19 11:46 Thomas Zimmermann
2023-10-12 11:16 Thomas Zimmermann
2023-10-05 9:26 Thomas Zimmermann
2023-09-28 8:12 Thomas Zimmermann
2023-09-21 15:37 Thomas Zimmermann
2023-09-14 12:26 Thomas Zimmermann
2023-09-07 7:44 Maxime Ripard
2023-08-24 8:41 Maxime Ripard
2023-08-17 13:38 Maxime Ripard
2023-08-10 6:52 Maxime Ripard
2023-08-03 7:39 Maxime Ripard
2023-07-27 7:05 Maxime Ripard
2023-07-20 7:58 Maxime Ripard
2023-07-13 8:17 Maxime Ripard
2023-07-07 7:23 Thomas Zimmermann
2023-06-21 19:43 Maarten Lankhorst
2023-06-16 11:32 Maarten Lankhorst
2023-06-08 8:41 [PULL] drm-intel-fixes Joonas Lahtinen
2023-06-08 8:45 ` [PULL] drm-MISC-fixes Maarten Lankhorst
2023-06-08 8:50 ` Jani Nikula
2023-06-08 9:24 ` Maarten Lankhorst
2023-04-26 5:59 [PULL] drm-misc-fixes Maarten Lankhorst
2023-05-11 8:01 ` Thomas Zimmermann
2023-05-11 10:04 ` Maarten Lankhorst
2023-04-20 8:31 Thomas Zimmermann
2023-04-13 18:42 Thomas Zimmermann
2023-04-13 19:27 ` Daniel Vetter
2023-04-05 18:28 Thomas Zimmermann
2023-04-05 19:10 ` Daniel Vetter
2023-03-30 14:10 Thomas Zimmermann
2023-03-30 17:52 ` Daniel Vetter
2023-03-23 8:24 Thomas Zimmermann
2023-03-24 9:17 ` Daniel Vetter
2023-03-16 14:33 Thomas Zimmermann
2023-02-23 8:38 Maxime Ripard
2023-02-16 9:19 Maxime Ripard
2023-02-09 8:36 Maxime Ripard
2023-02-02 8:57 Maxime Ripard
2023-01-26 10:40 Maxime Ripard
2023-01-19 8:20 Maxime Ripard
2023-01-12 13:09 Maxime Ripard
2023-01-05 7:49 Maxime Ripard
2023-01-05 10:10 ` Daniel Vetter
2022-12-22 13:02 Maxime Ripard
2022-12-08 18:47 Maarten Lankhorst
2022-11-30 13:16 Maarten Lankhorst
2022-11-30 13:43 ` Maxime Ripard
2022-11-30 14:10 ` Daniel Vetter
2022-11-24 10:26 Maarten Lankhorst
2022-11-17 18:30 Maarten Lankhorst
2022-11-09 16:22 Maarten Lankhorst
2022-11-02 21:59 Maarten Lankhorst
2022-10-27 10:00 Maarten Lankhorst
2022-10-20 11:34 Maarten Lankhorst
2022-10-13 12:37 Thomas Zimmermann
2022-09-29 14:43 Thomas Zimmermann
2022-09-22 14:12 Thomas Zimmermann
2022-09-15 12:03 Thomas Zimmermann
2022-09-08 12:38 Thomas Zimmermann
2022-08-31 18:33 Thomas Zimmermann
2022-08-25 7:31 Thomas Zimmermann
2022-08-16 9:44 Maxime Ripard
2022-07-29 9:45 Maxime Ripard
2022-07-21 8:55 Maxime Ripard
2022-07-14 7:18 Maxime Ripard
2022-07-08 5:43 Maxime Ripard
2022-06-30 7:24 Maxime Ripard
2022-06-23 6:41 Maxime Ripard
2022-06-16 7:25 Maxime Ripard
2022-06-09 10:07 Maxime Ripard
2022-05-26 9:05 Maxime Ripard
2022-05-20 7:24 Maxime Ripard
2022-05-13 7:30 Maxime Ripard
2022-05-05 15:50 Maarten Lankhorst
2022-04-27 6:04 Maarten Lankhorst
2022-04-22 8:44 Maxime Ripard
2022-04-07 10:56 Maarten Lankhorst
2022-03-24 7:58 Thomas Zimmermann
2022-03-17 10:29 Thomas Zimmermann
2022-03-10 19:35 Thomas Zimmermann
2022-03-03 10:06 Thomas Zimmermann
2022-02-23 19:27 Thomas Zimmermann
2022-02-17 11:16 Thomas Zimmermann
2022-02-10 9:50 Thomas Zimmermann
2022-02-03 11:29 Thomas Zimmermann
2022-01-27 9:04 Thomas Zimmermann
2022-01-14 12:54 Maxime Ripard
2021-12-16 8:26 Maxime Ripard
2021-12-09 12:43 Maxime Ripard
2021-12-02 8:44 Maxime Ripard
2021-11-25 10:18 Maxime Ripard
2021-11-18 7:54 Maxime Ripard
2021-11-11 8:48 Thomas Zimmermann
2021-10-28 7:23 Maxime Ripard
2021-10-26 12:17 Maarten Lankhorst
2021-10-21 9:33 Maarten Lankhorst
2021-10-14 12:19 Maarten Lankhorst
2021-10-15 5:17 ` Dave Airlie
2021-10-06 9:21 Maarten Lankhorst
2021-09-30 10:06 Maarten Lankhorst
2021-10-01 9:50 ` Daniel Vetter
2021-10-01 14:46 ` Daniel Vetter
2021-08-18 19:18 Thomas Zimmermann
2021-08-12 8:29 Thomas Zimmermann
2021-08-04 18:09 Thomas Zimmermann
2021-07-28 12:52 Thomas Zimmermann
2021-07-22 11:50 Thomas Zimmermann
2021-07-15 8:32 Thomas Zimmermann
2021-07-13 8:44 Thomas Zimmermann
2021-07-13 13:44 ` Daniel Vetter
2021-06-24 19:03 Maxime Ripard
2021-06-10 17:16 Maxime Ripard
2021-06-03 8:53 Maxime Ripard
2021-05-27 12:08 Maxime Ripard
2021-05-20 14:08 Maxime Ripard
2021-05-13 13:36 Maxime Ripard
2021-04-09 8:23 Maarten Lankhorst
2021-03-25 11:43 Maarten Lankhorst
2021-03-18 11:33 Maarten Lankhorst
2021-03-18 12:31 ` Daniel Vetter
2021-03-18 15:51 ` Maarten Lankhorst
2021-03-11 10:49 Maarten Lankhorst
2021-02-24 10:27 Thomas Zimmermann
2021-02-25 1:55 ` Dave Airlie
2021-02-25 7:53 ` Thomas Zimmermann
2021-02-25 8:29 ` Maxime Ripard
2021-02-25 8:54 ` Daniel Vetter
2021-02-10 14:08 Thomas Zimmermann
2021-02-02 12:36 Thomas Zimmermann
2021-01-27 7:56 Thomas Zimmermann
2021-01-27 8:13 ` Thomas Zimmermann
2021-01-20 12:09 Thomas Zimmermann
2021-01-20 12:14 ` Thomas Zimmermann
2021-01-12 13:21 Thomas Zimmermann
2021-01-08 9:34 Thomas Zimmermann
2021-01-08 9:53 ` Daniel Vetter
2020-12-03 12:59 Maxime Ripard
2020-11-26 8:54 Maxime Ripard
2020-11-19 8:39 Maxime Ripard
2020-11-12 13:07 Maxime Ripard
2020-11-05 10:13 Maxime Ripard
2020-10-29 17:34 Maxime Ripard
2020-10-01 7:21 Maarten Lankhorst
2020-09-24 10:47 Maarten Lankhorst
2020-09-18 11:11 Maarten Lankhorst
2020-09-10 5:51 Maarten Lankhorst
2020-08-26 7:40 Maarten Lankhorst
2020-08-12 13:24 Maarten Lankhorst
2020-08-04 12:55 Thomas Zimmermann
2020-07-28 11:04 Thomas Zimmermann
2020-07-22 7:03 Thomas Zimmermann
2020-07-15 17:17 Thomas Zimmermann
2020-07-08 12:10 Thomas Zimmermann
2020-07-02 7:51 Thomas Zimmermann
2020-06-25 8:27 Thomas Zimmermann
2020-05-28 11:09 Maxime Ripard
2020-05-14 7:35 Maxime Ripard
2020-05-07 16:01 Maxime Ripard
2020-04-30 15:32 Maxime Ripard
2020-04-23 10:32 Maxime Ripard
2020-03-26 14:04 Maarten Lankhorst
2020-03-18 14:07 Maarten Lankhorst
2020-03-18 11:55 Maarten Lankhorst
2020-03-05 10:19 Maarten Lankhorst
2020-02-20 10:06 Maarten Lankhorst
2020-02-07 9:13 Maarten Lankhorst
2020-01-22 21:37 Sean Paul
2020-01-16 16:28 Sean Paul
2020-01-08 20:59 Sean Paul
2019-12-31 15:25 Sean Paul
2019-12-11 21:21 Sean Paul
2019-11-25 9:43 Maxime Ripard
2019-11-25 9:43 ` Maxime Ripard
2019-11-13 14:26 Maxime Ripard
2019-11-07 8:22 Maxime Ripard
2019-11-07 8:22 ` Maxime Ripard
2019-10-30 18:22 Maxime Ripard
2019-10-23 11:26 Maxime Ripard
2019-10-23 11:26 ` Maxime Ripard
2019-10-17 20:34 Sean Paul
2019-10-10 10:51 Maxime Ripard
2019-10-03 8:10 Maxime Ripard
2019-10-02 20:06 Maxime Ripard
2019-10-03 7:26 ` Maxime Ripard
2019-10-07 14:24 ` Daniel Vetter
2019-09-12 7:13 Maarten Lankhorst
2019-09-05 16:41 Maarten Lankhorst
2019-08-28 18:57 Maarten Lankhorst
2019-08-22 10:22 Maarten Lankhorst
2019-08-08 9:01 Maarten Lankhorst
2019-08-02 13:43 Maarten Lankhorst
2019-08-02 15:07 ` Daniel Vetter
2019-07-25 16:09 Sean Paul
2019-07-04 0:13 Sean Paul
2019-06-26 20:56 Sean Paul
2019-06-19 19:27 Sean Paul
2019-06-13 14:39 Sean Paul
2019-06-13 20:45 ` Daniel Vetter
2019-06-05 21:03 Sean Paul
2019-05-29 21:18 Sean Paul
2019-05-22 19:44 Sean Paul
2019-05-02 12:25 Maxime Ripard
2019-04-25 13:27 Maxime Ripard
2019-04-11 15:16 Maxime Ripard
2019-03-25 10:45 Maxime Ripard
2019-02-22 8:57 Maarten Lankhorst
2019-02-13 10:01 Maarten Lankhorst via dri-devel
2019-02-07 8:21 Maarten Lankhorst
2019-01-24 8:25 Maarten Lankhorst
2019-01-17 11:06 Maarten Lankhorst
2019-01-10 6:52 Maarten Lankhorst
2018-12-20 16:57 Sean Paul
2018-12-20 17:32 ` Daniel Vetter
2018-12-12 20:43 Sean Paul
2018-12-05 20:14 Sean Paul
2018-11-28 20:04 Sean Paul
2018-11-28 20:36 ` Sean Paul
2018-11-21 15:52 Sean Paul
2018-11-14 20:45 Sean Paul
2018-11-07 20:50 Sean Paul
2018-10-19 10:57 Maarten Lankhorst
2018-10-18 16:28 Maarten Lankhorst
2018-10-04 8:37 Maarten Lankhorst
2018-09-27 15:27 Sean Paul
2018-09-27 10:02 Maarten Lankhorst
2018-09-19 14:32 Maarten Lankhorst
2018-07-27 8:24 Maarten Lankhorst
2018-07-13 7:28 Maarten Lankhorst
2018-07-05 13:19 Maarten Lankhorst
2018-06-28 9:49 Maarten Lankhorst
2018-06-21 14:08 Maarten Lankhorst
2018-06-12 9:09 Maarten Lankhorst
2018-05-16 19:21 Sean Paul
2018-05-09 20:26 Sean Paul
2018-05-02 19:53 Sean Paul
2018-04-25 19:39 Sean Paul
2018-04-18 19:26 Sean Paul
2018-03-22 18:57 Gustavo Padovan
2018-03-07 10:35 Gustavo Padovan
2018-02-28 15:37 Gustavo Padovan
2018-02-21 15:23 Gustavo Padovan
2018-01-31 15:16 Gustavo Padovan
2018-01-31 15:36 ` Gustavo Padovan
2018-01-17 9:26 Daniel Vetter
2018-01-08 9:51 Daniel Vetter
2017-12-21 13:01 Daniel Vetter
2017-12-14 14:50 Daniel Vetter
2017-12-14 14:50 ` Daniel Vetter
2017-12-14 19:48 ` Linus Torvalds
2017-12-14 19:48 ` Linus Torvalds
2017-12-07 15:04 Daniel Vetter
2017-12-06 21:03 Daniel Vetter
2017-11-30 7:44 Daniel Vetter
2017-11-20 15:27 Daniel Vetter
2017-11-13 19:27 Sean Paul
2017-11-02 13:13 Sean Paul
2017-10-11 19:54 Sean Paul
2017-10-05 11:23 Daniel Vetter
2017-09-28 10:37 Sean Paul
2017-08-28 21:18 Sean Paul
2017-08-24 14:09 Sean Paul
2017-08-18 15:57 Sean Paul
2017-08-18 20:19 ` Daniel Vetter
2017-08-18 20:29 ` Sean Paul
2017-08-09 13:52 Sean Paul
2017-07-27 19:32 Sean Paul
2017-07-20 21:19 Sean Paul
2017-06-15 20:13 Sean Paul
2017-06-08 0:22 Sean Paul
2017-06-02 18:33 Sean Paul
2017-05-25 17:44 Sean Paul
2017-05-26 5:30 ` Lukas Wunner
2017-05-26 5:59 ` Dave Airlie
2017-05-26 6:36 ` Daniel Vetter
2017-05-26 7:40 ` Jani Nikula
2017-05-26 14:04 ` Sean Paul
2017-05-28 10:08 ` Lukas Wunner
2017-05-29 6:56 ` Daniel Vetter
2017-03-31 6:07 Daniel Vetter
2017-03-23 15:50 Daniel Vetter
2017-03-06 9:41 Daniel Vetter
2017-02-09 7:51 Daniel Vetter
2017-01-31 17:11 Daniel Vetter
2017-01-23 10:11 Daniel Vetter
2017-01-13 8:11 Daniel Vetter
2017-01-09 19:17 Daniel Vetter
2017-01-04 16:24 Daniel Vetter
2016-12-22 7:29 Daniel Vetter
2016-11-30 19:29 Daniel Vetter
2016-10-27 6:36 Daniel Vetter
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=CAKMK7uEZv_YztMn5j0TWsakrRNdXk_ST3SUJRc_SVy08-THHSQ@mail.gmail.com \
--to=daniel.vetter@ffwll.ch \
--cc=airlied@gmail.com \
--cc=dim-tools@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=sean@poorly.run \
--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.