On Fri, Mar 18, 2022 at 10:36:01AM +0100, Andrew Jones wrote: > On Tue, Mar 15, 2022 at 11:02:14PM -0700, Bill Wendling wrote: > > Clang warns about using a bitwise '|' with boolean operands. This seems > > to be due to a small typo. > > > > lib/libfdt/fdt_rw.c:438:6: warning: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical] > > if (can_assume(LIBFDT_ORDER) | > > > > Using '||' removes this warnings. > > > > Signed-off-by: Bill Wendling <morbo@xxxxxxxxxx> > > --- > > lib/libfdt/fdt_rw.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c > > index 13854253ff86..3320e5559cac 100644 > > --- a/lib/libfdt/fdt_rw.c > > +++ b/lib/libfdt/fdt_rw.c > > @@ -435,7 +435,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) > > return struct_size; > > } > > > > - if (can_assume(LIBFDT_ORDER) | > > + if (can_assume(LIBFDT_ORDER) || > > !fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) { > > /* no further work necessary */ > > err = fdt_move(fdt, buf, bufsize); > > -- > > 2.35.1.723.g4982287a31-goog > > > > We're not getting as much interest in the submodule discussion as I hoped. > I see one vote against on this thread and one vote for on a different > thread[1]. For now I'll just commit a big rebase patch for libfdt. We can > revisit it again after we decide what to do for QCBOR. > Now merged through misc/queue. Thanks, drew