On Wed, Nov 06, 2024 at 06:44:23PM +0100, Jan Kara wrote: > On Mon 12-08-24 03:40:44, Al Viro wrote: > > On Mon, Aug 12, 2024 at 09:31:17AM +0800, Ma, Yu wrote: > > > > > > On 8/5/2024 2:56 PM, Christian Brauner wrote: > > > > 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. > > > > > > Thanks Christian and Al for your time and efforts. I'm not familiar with the > > > merging process, may i know about when these patches could be seen in master > > > > It's in work.fdtable in my tree, will post that series tonight and add to #for-next > > Al, it seems you didn't push the patches to Linus during the last merge > window. Do you plan to push them during the coming one? Yes, I do. I can merge that branch into viro/vfs.git#for-next, but that would be redundant - note that vfs/vfs.git#workd.fdtable is identical to it (same sha1 of head) and vfs/vfs.git#vfs.file contains a merge from it and vfs/vfs.git#vfs.all merges #vfs.file. So it's already in linux-next in the current form and until something else gets added to the branch I see no point.
