Messages in this thread | | | Date | Tue, 22 Sep 2020 11:27:29 +0200 | From | Mauro Carvalho Chehab <> | Subject | Re: [PATCH REBASE 0/3] atomisp: Rebased fixes |
| |
Em Tue, 22 Sep 2020 10:09:07 +0100 Alex Dewar <alex.dewar90@gmail.com> escreveu:
> Hi Mauro, > > I've rebased the patches now, but there is a slight hiccup. For patches 2 > and 3 of this series there will now be a conflict with commit 9289cdf39992 > ("staging: media: atomisp: Convert to GPIO descriptors") in Greg's tree. > > I'm not sure what the best way to handle this is? The merge conflicts > will be trivial (due to a conversion between the gpio_* and gpiod_* > APIs), but I could alternatively send these last two patches in via > Greg's tree if that's easier for people. Let me know what works.
Maybe the best would be to re-send those after the merge window, when both patches will arrive upstream.
Thanks, Mauro
| |