On Mon, 10 Sep 2018, Benson Leung wrote: > On Mon, Sep 10, 2018 at 5:12 PM Lee Jones <lee.jo...@linaro.org> wrote: > > > > On Fri, 07 Sep 2018, Benson Leung wrote: > > > > > Hi Enric, > > > > > > On Wed, Jul 18, 2018 at 06:09:56PM +0200, Enric Balletbo i Serra wrote: > > > > cros-ec includes inside the MFD subsystem, specially the file > > > > cros_ec_commands.h, has been modified several times and it has grown a > > > > lot, unfortunately, we didn't have care too much about the > > > > documentation. > > > > This patch tries to improve the documentation and also fixes all the > > > > issues reported by kerneldoc script. > > > > > > > > Signed-off-by: Enric Balletbo i Serra <enric.balle...@collabora.com> > > > > > > Applied, thanks. > > > > If applying patches from other subsystems, you need to wait for an > > appropriate Ack before applying. Please send me a succinct > > pull-request for this patch, so that we might avoid potential conflict > > at merge time. > > Ok Lee, sorry about that. Actually this hasn't landed in my for-next > branch yet so no conflict has happened yet. I will send you a PR > shortly.
No worries, it happens. The PR is to avoid merge conflicts at "merge time" i.e. when Linus merges everything into Mainline during the merge window. Appreciate your help. -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
