Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 2 May 2023 09:20:36 +0200
From:   Willy Tarreau <w@1wt.eu>
To:     Thomas =?iso-8859-1?Q?Wei=DFschuh?= <thomas@t-8ch.de>
Cc:     linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tools/nolibc: remove LINUX_REBOOT_ constants
Message-ID: <ZFC5xHVNEfyXtbLS@1wt.eu>
References: <20230428-nolibc-reboot-v1-1-0bca02d20ba6@weissschuh.net>
 <ZFCubzgPxBSDiTwq@1wt.eu>
 <c967837e-39c7-48e4-9ee7-65892f13d126@t-8ch.de>
 <ZFC0z8dh+DmVSYyk@1wt.eu>
 <781b8ce2-bc3e-4eef-b466-fc0e26f64bb5@t-8ch.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <781b8ce2-bc3e-4eef-b466-fc0e26f64bb5@t-8ch.de>
Precedence: bulk

On Tue, May 02, 2023 at 09:05:29AM +0200, Thomas Wei?schuh wrote:
> On 2023-05-02 08:59:27+0200, Willy Tarreau wrote:
> 
> <snip>
> 
> > > The following trivial fix on top of my patch would fix the problem:
> > > 
> > > diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
> > > index 5d624dc63a42..9d27131c224e 100644
> > > --- a/tools/include/nolibc/sys.h
> > > +++ b/tools/include/nolibc/sys.h
> > > @@ -21,6 +21,7 @@
> > >  #include <linux/auxvec.h>
> > >  #include <linux/fcntl.h> // for O_* and AT_*
> > >  #include <linux/stat.h>  // for statx()
> > > +#include <linux/reboot.h> // for LINUX_REBOOT_*
> > >  
> > >  #include "arch.h"
> > >  #include "errno.h"
> > 
> > Indeed it works for me as well.
> > 
> > > Want me to send a v2 or will you fix it up on your side?
> > 
> > It depends. If for you it's a fix and needed for 6.4 (or maybe older),
> > then that one is needed with the "//" comment, and it will later
> > conflict with your previous cleanup patch that's already queued. If
> > you're fine with having it queued for 6.5 only however, then I'll just
> > edit your patch and add that above. I tend to think the second solution
> > is sufficient given that nobody complained till now ;-)
> 
> This is absolutely not urgent. 6.5 is fine.

OK, now queued on top of my 20230415-nolibc-updates-4a branch that
I'll soon send to Paul.

Thank you!
Willy