From: Daniel Vetter <daniel@ffwll.ch>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: dim-tools@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Thomas Zimmermann <tzimmermann@suse.de>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Dave Airlie <airlied@gmail.com>
Subject: Re: [Intel-gfx] [PULL] drm-misc-next
Date: Sat, 25 Jun 2022 00:12:05 +0200 [thread overview]
Message-ID: <YrY2tRX/kqGtZNC2@phenom.ffwll.local> (raw)
In-Reply-To: <87bkujrc4n.fsf@intel.com>
On Thu, Jun 23, 2022 at 11:56:56AM +0300, Jani Nikula wrote:
> On Thu, 23 Jun 2022, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> > Hi
> >
> > Am 23.06.22 um 10:26 schrieb Jani Nikula:
> >> On Thu, 23 Jun 2022, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> >>> I forgot to mention that we backmerged v5.19-rc2. That's why the list of
> >>> changed files is so long.
> >>
> >> I thought we should only backmerge Linus' tree via backmerging drm-next,
> >> which avoids this problem altogether.
> >
> > I did backmerge via drm-next.
>
> Then I'm confused how it all shows up the the diffstat. If you backmerge
> drm-next to drm-misc-next, and then generate your drm-misc-next pull
> request against drm-next (dim pull-request drm-misc-next drm/drm-next),
> I don't think it should show up.
git is shit (tm)
The git commit list will look reasonable, but the diff will make a
complete mess out of non-linear history. I think it's this case here too.
I think the way to fix it is to do a manual test merge and then to a diff
against the first parent (assuming you did the test merge forward, not
backwards). Without the test merge git tries to do some kind of multi-way
diffstat.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
dim-tools@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Thomas Zimmermann <tzimmermann@suse.de>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [PULL] drm-misc-next
Date: Sat, 25 Jun 2022 00:12:05 +0200 [thread overview]
Message-ID: <YrY2tRX/kqGtZNC2@phenom.ffwll.local> (raw)
In-Reply-To: <87bkujrc4n.fsf@intel.com>
On Thu, Jun 23, 2022 at 11:56:56AM +0300, Jani Nikula wrote:
> On Thu, 23 Jun 2022, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> > Hi
> >
> > Am 23.06.22 um 10:26 schrieb Jani Nikula:
> >> On Thu, 23 Jun 2022, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> >>> I forgot to mention that we backmerged v5.19-rc2. That's why the list of
> >>> changed files is so long.
> >>
> >> I thought we should only backmerge Linus' tree via backmerging drm-next,
> >> which avoids this problem altogether.
> >
> > I did backmerge via drm-next.
>
> Then I'm confused how it all shows up the the diffstat. If you backmerge
> drm-next to drm-misc-next, and then generate your drm-misc-next pull
> request against drm-next (dim pull-request drm-misc-next drm/drm-next),
> I don't think it should show up.
git is shit (tm)
The git commit list will look reasonable, but the diff will make a
complete mess out of non-linear history. I think it's this case here too.
I think the way to fix it is to do a manual test merge and then to a diff
against the first parent (assuming you did the test merge forward, not
backwards). Without the test merge git tries to do some kind of multi-way
diffstat.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2022-06-24 22:12 UTC|newest]
Thread overview: 174+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 8:02 [PULL] drm-misc-next Thomas Zimmermann
2022-06-23 8:02 ` [Intel-gfx] " Thomas Zimmermann
2022-06-23 8:07 ` Thomas Zimmermann
2022-06-23 8:07 ` [Intel-gfx] " Thomas Zimmermann
2022-06-23 8:26 ` Jani Nikula
2022-06-23 8:26 ` Jani Nikula
2022-06-23 8:36 ` [Intel-gfx] " Thomas Zimmermann
2022-06-23 8:36 ` Thomas Zimmermann
2022-06-23 8:56 ` [Intel-gfx] " Jani Nikula
2022-06-23 8:56 ` Jani Nikula
2022-06-24 22:12 ` Daniel Vetter [this message]
2022-06-24 22:12 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2023-12-07 9:59 [Intel-gfx] " Maxime Ripard
2023-11-30 9:15 Maxime Ripard
2023-11-23 12:58 Maxime Ripard
2023-11-23 19:40 ` Daniel Vetter
2023-11-17 9:41 Maxime Ripard
2023-11-20 9:31 ` Daniel Vetter
2023-11-03 16:37 David Edelsohn
2023-11-06 10:01 ` Thomas Hellström
2023-11-06 10:20 ` Maxime Ripard
2023-11-06 10:37 ` Thomas Hellström
2023-11-06 10:47 ` Thomas Hellström
2023-11-06 10:55 ` Maxime Ripard
2023-11-06 14:57 ` David Edelsohn
2023-10-27 7:17 Maarten Lankhorst
2023-10-19 11:40 Maarten Lankhorst
2023-10-12 9:40 Maarten Lankhorst
2023-10-06 8:37 Maarten Lankhorst
2023-09-27 10:09 Maarten Lankhorst
2023-09-11 12:45 Maarten Lankhorst
2023-08-10 8:45 Thomas Zimmermann
2023-08-03 15:01 Thomas Zimmermann
2023-07-27 12:44 Thomas Zimmermann
2023-07-27 13:10 ` Daniel Vetter
2023-07-21 14:50 Maxime Ripard
2023-07-27 13:00 ` Daniel Vetter
2023-07-13 9:08 Thomas Zimmermann
2023-07-18 10:25 ` Daniel Vetter
2023-06-07 8:56 Thomas Zimmermann
2023-06-01 11:22 Thomas Zimmermann
2023-05-24 12:42 Thomas Zimmermann
2023-05-11 7:28 Maxime Ripard
2023-05-17 16:44 ` Thomas Zimmermann
2023-04-12 13:32 Maarten Lankhorst
2023-04-12 14:24 ` Daniel Vetter
2023-03-31 15:42 Maarten Lankhorst
2023-04-03 8:24 ` Daniel Vetter
2023-03-23 11:08 Maarten Lankhorst
2023-03-24 19:21 ` Daniel Vetter
2023-03-16 15:39 Maarten Lankhorst
2023-03-07 10:14 Maarten Lankhorst
2023-01-26 8:15 Thomas Zimmermann
2023-01-24 20:02 Thomas Zimmermann
2023-01-19 8:47 Thomas Zimmermann
2023-01-23 15:00 ` John Paul Adrian Glaubitz
2023-01-23 15:13 ` Thomas Zimmermann
2023-01-23 15:23 ` John Paul Adrian Glaubitz
2023-01-23 15:35 ` Thomas Zimmermann
2023-01-23 15:48 ` John Paul Adrian Glaubitz
2023-02-02 14:54 ` Deucher, Alexander
2023-01-24 16:56 ` Daniel Vetter
2023-01-12 12:56 Thomas Zimmermann
2023-01-03 10:51 Thomas Zimmermann
2023-01-04 15:18 ` Daniel Vetter
2022-11-24 7:46 Maxime Ripard
2022-11-17 8:36 Maxime Ripard
2022-11-10 8:36 Maxime Ripard
2022-11-03 8:34 Maxime Ripard
2022-10-27 7:34 Maxime Ripard
2022-10-20 7:24 Maxime Ripard
2022-09-30 8:54 Maarten Lankhorst
2022-09-23 7:39 Maxime Ripard
2022-09-09 8:46 Maarten Lankhorst
2022-09-06 6:53 Maarten Lankhorst
2022-09-06 15:20 ` Daniel Vetter
2022-07-07 7:13 Thomas Zimmermann
2022-06-30 7:19 Thomas Zimmermann
2022-06-17 7:21 Thomas Zimmermann
2022-06-08 10:34 Thomas Zimmermann
2022-06-15 18:14 ` Daniel Vetter
2022-05-05 13:11 Maxime Ripard
2022-04-28 7:52 Maxime Ripard
2022-04-21 6:59 Maxime Ripard
2022-04-14 7:38 Maxime Ripard
2022-04-07 8:59 Maxime Ripard
2022-03-03 9:28 Maarten Lankhorst
2022-02-23 12:49 Maarten Lankhorst
2022-01-27 11:57 Maarten Lankhorst
2022-02-01 6:38 ` Dave Airlie
2022-02-01 8:17 ` Maarten Lankhorst
2022-02-01 11:14 ` Thomas Zimmermann
2022-02-22 20:17 ` Thomas Zimmermann
2021-12-16 14:34 Thomas Zimmermann
2021-12-09 11:46 Thomas Zimmermann
2021-11-29 8:56 Thomas Zimmermann
2021-12-14 8:53 ` Daniel Vetter
2021-11-18 9:13 Thomas Zimmermann
2021-10-14 12:04 Maxime Ripard
2021-10-14 13:24 ` Hans de Goede
2021-10-14 14:30 ` Hans de Goede
2021-10-06 10:48 Maarten Lankhorst
2021-09-30 11:27 Maxime Ripard
2021-09-23 7:45 Maxime Ripard
2021-09-16 7:31 Maxime Ripard
2021-09-20 22:29 ` Rob Herring
2021-09-22 7:44 ` Maxime Ripard
2021-08-12 19:34 Maarten Lankhorst
2021-08-05 10:22 Maarten Lankhorst
2021-07-29 20:57 Maarten Lankhorst
2021-07-22 10:46 Maarten Lankhorst
2021-07-16 11:07 Maarten Lankhorst
2021-07-21 4:03 ` Dave Airlie
2021-07-21 8:44 ` Thomas Zimmermann
2021-06-10 11:15 Thomas Zimmermann
2021-06-10 13:32 ` Daniel Vetter
2021-06-11 6:53 ` Thomas Zimmermann
2021-06-09 7:42 Thomas Zimmermann
2021-06-01 15:11 Thomas Zimmermann
2021-05-17 13:17 Thomas Zimmermann
2021-05-17 13:25 ` Thomas Zimmermann
2021-05-12 14:19 Thomas Zimmermann
2021-04-09 9:00 Maxime Ripard
2021-04-01 11:05 Maxime Ripard
2021-03-25 9:47 Maxime Ripard
2021-03-16 8:03 Maxime Ripard
2021-03-03 10:06 Maxime Ripard
2021-01-19 11:39 Maarten Lankhorst
2021-01-20 12:11 ` Daniel Vetter
2021-01-06 11:13 Maarten Lankhorst
2021-01-07 12:42 ` Daniel Vetter
2020-12-17 10:12 Maarten Lankhorst
2021-01-07 9:59 ` Daniel Vetter
2020-11-27 8:30 Thomas Zimmermann
2020-11-18 12:32 Thomas Zimmermann
2020-11-12 8:01 Thomas Zimmermann
2020-11-05 10:16 Thomas Zimmermann
2020-10-27 10:09 Thomas Zimmermann
2020-10-27 10:11 ` Thomas Zimmermann
2020-09-21 15:29 Maxime Ripard
2020-09-18 8:11 Maxime Ripard
2020-09-10 8:18 Maxime Ripard
2020-09-03 16:06 Maxime Ripard
2020-08-27 15:55 Maxime Ripard
2020-08-20 12:56 Maxime Ripard
2020-08-26 10:02 ` Jani Nikula
2020-08-30 6:05 ` Daniel Vetter
2020-07-22 10:38 Maarten Lankhorst
2020-07-16 11:42 Maarten Lankhorst
2020-07-02 13:16 Maarten Lankhorst
2020-06-26 10:52 Maarten Lankhorst
2020-06-19 15:19 Maarten Lankhorst
2020-05-14 7:08 Thomas Zimmermann
2020-05-07 7:25 Thomas Zimmermann
2020-04-23 8:34 Thomas Zimmermann
2020-04-14 9:07 Thomas Zimmermann
2020-04-21 12:46 ` Thomas Zimmermann
2020-04-21 13:41 ` Daniel Vetter
2020-04-21 14:05 ` Thomas Zimmermann
2020-03-17 8:28 Maxime Ripard
2020-03-09 13:54 Maxime Ripard
2020-02-27 11:32 Maxime Ripard
2020-02-21 10:09 Maxime Ripard
2020-02-10 9:34 Maxime Ripard
2020-01-10 11:50 Maarten Lankhorst
2020-01-07 11:50 Maarten Lankhorst
2020-01-07 15:25 ` Daniel Vetter
2020-01-02 13:06 Maarten Lankhorst
2019-12-17 8:48 Maarten Lankhorst
2019-12-17 12:59 ` Daniel Vetter
2019-10-31 19:30 Sean Paul
2019-10-31 19:30 ` Sean Paul
2019-10-24 15:55 Sean Paul
2019-10-24 15:55 ` Sean Paul
2019-10-17 19:26 Sean Paul
2019-10-18 13:45 ` Tomi Valkeinen
2019-10-18 20:11 ` Sean Paul
2019-10-21 8:09 ` Tomi Valkeinen
2019-10-21 15:48 ` Sean Paul
2019-10-22 2:17 ` [Intel-gfx] " Dave Airlie
2019-10-22 7:01 ` 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=YrY2tRX/kqGtZNC2@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--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=rodrigo.vivi@intel.com \
--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.