On Mon, 21 Aug 2023, Rob Herring wrote: > On Mon, Aug 21, 2023 at 2:13 AM Lee Jones <lee@xxxxxxxxxx> wrote: > > > > On Mon, 21 Aug 2023, Lee Jones wrote: > > > > > On Mon, 21 Aug 2023, Stephen Rothwell wrote: > > > > > > > Hi all, > > > > > > > > After merging the battery tree, today's linux-next build (x86_64 > > > > allmodconfig) failed like this: > > > > > > > > drivers/power/supply/rt5033_charger.c: In function 'rt5033_charger_probe': > > > > drivers/power/supply/rt5033_charger.c:694:19: error: implicit declaration of function 'of_parse_phandle' [-Werror=implicit-function-declaration] > > > > > > Is this because your merge-conflict patch: > > > > > > linux-next: manual merge of the battery tree with the mfd tree > > > > > > ... removed of_device.h? > > > > Oh, that was Rob's patch. I see now, thanks. > > Presumably the functions below got added and failed to add of.h and > instead relied on of_device.h's implicit include of of.h which is > going to get removed. So Stephen's fix is the correct one. Super. Stephen, would you mind submitting it in a format we can apply? -- Lee Jones [李琼斯]
