Re: [PATCH v5 0/3] fs/file.c: optimize the critical section of file_lock in

From: Christian Brauner
Date: Mon Aug 05 2024 - 02:57:15 EST


On Fri, Aug 02, 2024 at 03:22:48PM GMT, Al Viro wrote:
> On Fri, Aug 02, 2024 at 01:04:44PM +0200, Christian Brauner wrote:
> > > Hmm... Something fishy's going on - those are not reachable by any branches.
> >
> > Hm, they probably got dropped when rebasing to v6.11-rc1 and I did have
> > to play around with --onto.
> >
> > > I'm putting together (in viro/vfs.git) a branch for that area (#work.fdtable)
> > > and I'm going to apply those 3 unless anyone objects.
> >
> > Fine since they aren't in that branch. Otherwise I generally prefer to
> > just merge a common branch.
>
> If it's going to be rebased anyway, I don't see much difference from cherry-pick,
> TBH...

Yeah, but I generally don't rebase after -rc1 anymore unles there's
really annoying conflicts.