Received-SPF: pass (google.com: domain of linux-kernel+bounces-73484-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 20 Feb 2024 19:02:52 +0100
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org
Subject: Re: [GIT PULL] bcachefs stable updates for v6.7
Message-ID: <2024022041-vantage-ranking-2a62@gregkh>
References: <6yl6zvu2pa3mz7irsaax5ivp6kh3dae5kaslvst7yafmg6672g@mskleu2vjfp2>
 <2024021307-reactive-woven-8543@gregkh>
 <2024021300-deck-duffel-5d2b@gregkh>
 <jhwinzfpw2xjjdwsgqsrtjnzcqdbfoqev3qrm65oaxktua4c7m@mes2iwvk2yep>
 <2024021419-tumbling-rewind-dd83@gregkh>
 <2024022024-plywood-energize-f059@gregkh>
 <pkearorf3vty5zqui6souxaesd57e4oef2ds45da7sb4mfqij3@5l3r6f7uwgwe>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <pkearorf3vty5zqui6souxaesd57e4oef2ds45da7sb4mfqij3@5l3r6f7uwgwe>

On Tue, Feb 20, 2024 at 12:25:25PM -0500, Kent Overstreet wrote:
> On Tue, Feb 20, 2024 at 03:34:52PM +0100, Greg Kroah-Hartman wrote:
> > On Wed, Feb 14, 2024 at 07:51:01AM +0100, Greg Kroah-Hartman wrote:
> > > On Tue, Feb 13, 2024 at 09:28:37PM -0500, Kent Overstreet wrote:
> > > > On Tue, Feb 13, 2024 at 03:44:25PM +0100, Greg Kroah-Hartman wrote:
> > > > > On Tue, Feb 13, 2024 at 03:38:10PM +0100, Greg Kroah-Hartman wrote:
> > > > > > On Thu, Feb 08, 2024 at 08:14:39PM -0500, Kent Overstreet wrote:
> > > > > > > Hi Greg, few stable updates for you -
> > > > > > > 
> > > > > > > Cheers,
> > > > > > > Kent
> > > > > > > 
> > > > > > > The following changes since commit 0dd3ee31125508cd67f7e7172247f05b7fd1753a:
> > > > > > > 
> > > > > > >   Linux 6.7 (2024-01-07 12:18:38 -0800)
> > > > > > > 
> > > > > > > are available in the Git repository at:
> > > > > > > 
> > > > > > >   https://evilpiepirate.org/git/bcachefs.git tags/bcachefs-for-v6.7-stable-20240208
> > > > > > > 
> > > > > > > for you to fetch changes up to f1582f4774ac7c30c5460a8c7a6e5a82b9ce5a6a:
> > > > > > > 
> > > > > > >   bcachefs: time_stats: Check for last_event == 0 when updating freq stats (2024-02-08 15:33:11 -0500)
> > > > > > 
> > > > > > This didn't work well :(
> > > > > > 
> > > > > > All of the original git commit ids are gone, and for me to look them up
> > > > > > and add them back by hand is a pain.  I'll do it this time, but next
> > > > > > time can you please include them in the commit somewhere (cherry-pick -x
> > > > > > will do it automatically for you)
> > > > > > 
> > > > > > Let's see if I can figure it out...
> > > > > 
> > > > > I got all but 3 applied, can you please send an updated set of 3 patches
> > > > > for the ones I couldn't just cherry-pick from Linus's tree?
> > > > 
> > > > New pull request work?
> > > > 
> > > > The following changes since commit 0dd3ee31125508cd67f7e7172247f05b7fd1753a:
> > > > 
> > > >   Linux 6.7 (2024-01-07 12:18:38 -0800)
> > > > 
> > > > are available in the Git repository at:
> > > > 
> > > >   https://evilpiepirate.org/git/bcachefs.git tags/bcachefs-6.7-stable-2024-02-13
> > > 
> > > Thanks, I'll look at these after this round of -rc kernels are released,
> > > which should have most of these in the release alraedy, but not all.
> > 
> > Didn't work, can you rebase on 6.7.5 please?  I tried to rebase the tree
> > here, but it gave me rejects that I didn't know how to resolve.
> 
> Because sasha cherry picked some of those fixes himself, despite an
> explicit ack that he wouldn't.

No, I rebased on a "clean" 6.7.5 that had no changes on top of it at
all.  It had nothing to do with anything in the queue right now.

> And one of the fixes had a locking bug, and he missed the fix for that.
> 
> You're going to have to revert all that if you want my pull request to
> apply.

I'll go drop those, sorry for them getting added, but again, this had
nothing to do with your pull request failing.

thanks,

greg k-h