Hi Linus, On Fri, 13 Sep 2024 16:41:58 +0200 Christian Brauner <brauner@xxxxxxxxxx> wrote: > > (1) linux-next: build failure after merge of the bpf-next tree > https://lore.kernel.org/r/20240913133240.066ae790@xxxxxxxxxxxxxxxx > > The reported merge conflict isn't really with bpf-next but with the > series to convert to fd_file() accessors for the changed struct fd > representation. > > The patch you need to fix this however is correct in that draft. But > honestly, it's pretty easy for you to figure out on your own anyway. Except Al Viro told me an earlier time we had this conflict (the commit the did the convert to fd_file() was removed form linux-next for a while) that !fd_file(f) should (could)? be replaced by fd_empty(f) - but that may be done later. -- Cheers, Stephen Rothwell
Attachment:
pgpviid20Vtx1.pgp
Description: OpenPGP digital signature
