On Wed, Aug 14, 2024 at 10:56:29AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > fs/coda/inode.c > > between commit: > > 626c2be9822d ("coda: use param->file for FSCONFIG_SET_FD") FWIW, I'm not sure that FSCONFIG_SET_FD is a good idea, seeing that it went without a single user for 6 years and this case does not look convincing. Oh, well - too late for that, by 8 years or so...