Em Fri, 15 Jul 2016 17:36:15 +0200 Ricardo Ribalda Delgado <[email protected]> escreveu:
> Hi Mauro > > On Fri, Jul 15, 2016 at 5:28 PM, Mauro Carvalho Chehab > <[email protected]> wrote: > > Hi Ricardo, > > > > I'm not seeing patch 1. > > That is because you blacklisted me :P > https://lkml.org/lkml/2016/7/15/45 > > I resend it to you right away. Thanks. > > > > Anyway, please send documentation patches against the rst files. They're > > at the "docs-next" branch and will be merged upstream on this merge window. > > > > you are absolutely right, I read about it in lwn. Sorry about that. > > > How do you prefer it: > - 2 patchset : One on top of media/master with the code changes, and > one on top of docs-next with the doc changes. > or > -1 patchset on top of doc-next and we will figure out later if there > is a merge conflict with media IMHO, the best would be to wait for it to be merged. I'm finishing handling patches for 4.7 in a few, and applying only on more trivial patches and bug fixes. Yet, I suspect that there won't be conflicts if you base your patches against docs-next, as most of the media stuff is merged there. Thanks, Mauro
