[11:58] <mchehab> hi all
[12:00] <syoung> hi
[12:00] <hverkuil> hi
[12:04] <syoung> hverkuil: on linuxtv.org, the news item about the Linux Media Submit in Edinburgh has a typo - s/Edimburgh/Edinburgh/
[12:05] <hverkuil> mchehab: ^^^^
[12:05] <mchehab> ping hverkuil, pinchartl, sailus, syoung
[12:09] <syoung> pong :)
[12:12] <hverkuil> shall we just start?
[12:15] <hverkuil> I'll get some tea first.
[12:17] <hverkuil> ready
[12:18] <hverkuil> mchehab: do you have cxusb-based DVB hardware?
[12:18] <mchehab> no, I don't
[12:18] <mchehab> mkrufky should have some hardware based on it
[12:19] <hverkuil> Maciej's medion patches are almost ready to be merged, but I prefer it if someone can test with non-medion hardware first to check nothing breaks.
[12:20] <mchehab> yeah, makes sense
[12:20] <hverkuil> I'll check with mkrufky.
[12:21] <mchehab> If I'm not mistaken, he has two or three different cxusb devices at least
[12:22] <mchehab> (from what I remember from patches he submitted)
[12:22] <mchehab> from my side, I indend to apply pending pull requests until tomorrow
[12:22] <hverkuil> I've posted almost all pull requests for 5.2. There is one more in the pipeline, either today or tomorrow morning.
[12:23] <mchehab> I'll dig into the patches that nobody picked and will try to merge as much as possible
[12:23] <mchehab> (or give a review feedback if they're not ok)
[12:23] <syoung> mchehab: please note https://lkml.org/lkml/2019/4/23/136
[12:24] <hverkuil> I think I reviewed everything that needs reviewing, except for v6 of Marco Felsch's series.
[12:25] <mchehab> syoung: yeah, I saw that... what happened there? did we apply two different patches for the same issue, one at fixes and another one at master?
[12:26] <syoung> mchehab: this is my fault. I sent out a pull fixes request which got accepted but the patch never appeared on media_tree fixes branch.
[12:26] <syoung> actually it is here: https://git.linuxtv.org/mchehab/media-next.git/log/
[12:26] <syoung> (first fix)
[12:27] <syoung> Arnd sent out a similar fix so sent pull request with his fix in it; I assumed the first fix was lost. I should have asked.
[12:28] <mchehab> let me check where I place the fixes
[12:29] <syoung> So Arnd Bergmann's fix is in media_tree master branch: https://git.linuxtv.org/media_tree.git/commit/?id=63604a143fe168094fbbccba56f6e3241683e399
[12:29] <syoung> his fix is 4 characters shorter :)
[12:34] <mchehab> :-)
[12:34] <mchehab> I guess we should either revert your patch from -fixes or rebase that branch
[12:35] <mchehab> revert could actually cause more merge troubles at -next
[12:35] <syoung> but it's not in fixes
[12:36] <mchehab> that depends on what order the trees are applied at -next
[12:36] <mchehab> if master is applied first there, merging from fixes will rise conflicts
[12:37] <syoung> but it's not on the fixes branch
[12:37] <mchehab> Hmm.. I guess we should, instead pick arnd in fixes, solving conflicts
[12:37] <mchehab> or revert the patch and apply arnd's
[12:38] <mchehab> that will probably be the safest/cleanest solution
[12:38] <syoung> I don't understand why you're talking about changing the fixes branch when it is not there
[12:39] <syoung> neither patch is
[12:39] <mchehab> yeah, good news: I applied it at the wrong tree
[12:39] <mchehab> I have 3 trees here
[12:39] <mchehab> actually 3 branches merged on next
[12:39] <mchehab> - master
[12:40] <mchehab> - fixes
[12:40] <mchehab> - linux-next
[12:40] <mchehab> the last one is meant to be used only when I need to do some conflict resolution or merge some topic branch
[12:40] <mchehab> this tree can be rebased
[12:40] <mchehab> as nobody base on it
[12:40] <syoung> great, so my patch can just be dropped from that and we're good?
[12:41] <mchehab> (such tree is hosted at Kernel.org)
[12:41] <mchehab> yes
[12:41] <syoung> great! I'm sorry about this
[12:41] <mchehab> solved
[12:41] <mchehab> well, it was my fault too...
[12:41] <mchehab> probably in the hurry for my travel, I ended using the wrong tree
[12:42] <hverkuil> That reminds me, did you have a nice vacation?
[12:44] <mchehab> I had a nice time in Portugal - it was not exactly a vacation - my son's team got 2nd place at ICPC/2019 among Brazilian teams and 3rd place among all LA teams
[12:44] <hverkuil> Congratulations! One proud daddy :-)
[12:44] <mchehab> yeah!
[12:45] <mchehab> I ended by returning earlier from vacations, but got sidetracked with documentation
[12:45] <mchehab> and other internal stuff
[12:49] <mchehab> anything else for today's meeting?
[12:50] <hverkuil> No. Just posted the last pull request.
[12:51] <hverkuil> There is a small chance there will be another, but I fear that the rockchip mpeg-2 support will slip to 5.3.
[12:51] <syoung> mchehab: that's really good! congratulations :)
[13:18] <mchehab> ok
[13:19] *** ChanServ sets mode: +v hverkuil
[13:19] <mchehab> https://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git/log/
[13:19] <mchehab> syoung: tnx... patch should have gone from -next
[13:19] <mchehab> for tomorrow's version
[13:31] <syoung> mchehab: it's still here: https://git.linuxtv.org/mchehab/media-next.git/
[13:35] <mchehab> solved
[13:35] <mchehab> removed the cache