On Mon, Sep 2, 2024 at 6:46 PM Aleksa Sarai <cyphar@xxxxxxxxxx> wrote: > > These come from Linux v6.11-rc5. > > Signed-off-by: Aleksa Sarai <cyphar@xxxxxxxxxx> > --- > src/open_by_handle.c | 4 +++- > src/statx.h | 22 ++++++++++++++++++++-- > 2 files changed, 23 insertions(+), 3 deletions(-) > This patch conflicts with commit 873e36c9 - statx.h: update to latest kernel UAPI already in for-next branch (this is the branch to base patches on) > diff --git a/src/open_by_handle.c b/src/open_by_handle.c > index 0f74ed08b1f0..d9c802ca9bd1 100644 > --- a/src/open_by_handle.c > +++ b/src/open_by_handle.c > @@ -82,12 +82,14 @@ Examples: > #include <string.h> > #include <fcntl.h> > #include <unistd.h> > -#include <sys/stat.h> > #include <sys/types.h> > #include <errno.h> > #include <linux/limits.h> > #include <libgen.h> > > +#include <sys/stat.h> > +#include "statx.h" > + So probably best to squash this one liner into the 2nd patch. I guess Zorro can do it on commit if needed. Thanks, Amir.
