All of lore.kernel.org
 help / color / mirror / Atom feed
From: Al Viro <viro@zeniv.linux.org.uk>
To: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BUILD: failure for Regression on linux-next (next-20250120) (rev2)
Date: Wed, 29 Jan 2025 21:11:25 +0000	[thread overview]
Message-ID: <20250129211125.GS1977892@ZenIV> (raw)
In-Reply-To: <173818401779.2530294.11352683650301608238@b555e5b46a47>

On Wed, Jan 29, 2025 at 08:53:37PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: Regression on linux-next (next-20250120) (rev2)
> URL   : https://patchwork.freedesktop.org/series/143978/
> State : failure
> 
> == Summary ==
> 
> Error: patch https://patchwork.freedesktop.org/api/1.0/series/143978/revisions/2/mbox/ not applied
> Applying: Regression on linux-next (next-20250120)
> Using index info to reconstruct a base tree...
> M	fs/debugfs/file.c
> Falling back to patching base and 3-way merge...
> Auto-merging fs/debugfs/file.c
> CONFLICT (content): Merge conflict in fs/debugfs/file.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Patch failed at 0001 Regression on linux-next (next-20250120)
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> Build failed, no error log produced

Not to put too fine a point on that, but... which tree does it fail
to apply to, seeing that both mainline and -next are identical
in fs/debugfs/* and the patch in question applies cleanly to either?

  reply	other threads:[~2025-01-29 21:11 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-23 15:41 Regression on linux-next (next-20250120) Borah, Chaitanya Kumar
2025-01-23 18:18 ` Al Viro
2025-01-24 13:55   ` Borah, Chaitanya Kumar
2025-01-26 15:54   ` Alexander Gordeev
2025-01-27  5:04     ` Al Viro
2025-01-28 16:00       ` Borah, Chaitanya Kumar
2025-01-29  4:37         ` Al Viro
2025-01-29  7:13           ` Greg Kroah-Hartman
2025-01-29 19:19             ` Al Viro
2025-01-30  7:25               ` Greg Kroah-Hartman
2025-01-30  8:08                 ` Borah, Chaitanya Kumar
2025-01-30  8:36                   ` Greg Kroah-Hartman
2025-01-27  5:53 ` ✗ CI.Patch_applied: failure for " Patchwork
2025-01-27  6:02 ` ✗ Fi.CI.BUILD: " Patchwork
2025-01-29 20:53 ` ✗ Fi.CI.BUILD: failure for Regression on linux-next (next-20250120) (rev2) Patchwork
2025-01-29 21:11   ` Al Viro [this message]
2025-01-30  9:24     ` Jani Nikula
2025-01-29 20:59 ` ✗ CI.Patch_applied: " Patchwork

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=20250129211125.GS1977892@ZenIV \
    --to=viro@zeniv.linux.org.uk \
    --cc=intel-gfx@lists.freedesktop.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.