Re: important orangefs merge conflict request...

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Tue, Jun 03, 2025 at 07:02:09AM -0400, Mike Marshall wrote:
> Hi Greg...
> 
> >> Sure, what is the upstream git commit id of the patch?
> 
> b36ddb9210 is the commit where Linus pulled my fix into 6.15.
> 
> Some of Matthew Wilcox's folio work also landed in orangefs in 6.15,
> causing b36ddb9210 to have a merge conflict with 6.14.
> 
> I tested during 6.14-rc7 and Commit 665575cf was pulled into
> 6.14-rc7 after I tested, causing orangefs to be broken in 6.14.
> 
> So... there is not an upstream commit id for my patch that works
> with 6.14.
> 
> Pulling 665575cf so late into rc7, even though it was known to
> have caused deadlock problems with ext4 and (?) seems like
> an "unlinuxy" thing to have done. I was just hoping there was
> some way to get my un-committed 6.14 flavored patch
> backported to 6.14... I figured if it was possible, you'd
> know how...

Just submit it to us at stable@vger.kernel.org as a backport of the
commit like any other normal stable backport?

thanks,

greg k-h