linux-next: manual merge of the staging tree with the v4l-dvb tree

2018-10-07 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/media/imx/imx-media-of.c between commit: 21711787045d ("media: staging/imx: of: Remove recursive graph walk") from the v4l-dvb tree and commit: f93861c2d611 ("staging: Convert to using %pOFn

linux-next: manual merge of the staging tree with the v4l-dvb tree

2018-10-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/media/imx/imx-media-dev.c between commit: b803cd359833 ("media: staging/imx: Switch to v4l2_async_notifier_add_*_subdev") from the v4l-dvb tree and commit: f93861c2d611 ("staging: Convert to using

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2018-05-25 Thread Stephen Rothwell
Hi Mauro, On Thu, 17 May 2018 07:06:57 -0300 Mauro Carvalho Chehab wrote: > > What do you use in order to check it? Maybe we could have some git > hook running such check, in order to prevent merging patches without > the right SOBs. I run the script below on the

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2018-05-17 Thread Mauro Carvalho Chehab
Em Thu, 17 May 2018 14:17:27 +1000 Stephen Rothwell escreveu: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/atomisp/TODO > > between commit: > > 51b8dc5163d2 ("media: staging: atomisp: Remove driver") > >

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2018-05-17 Thread Greg KH
On Thu, May 17, 2018 at 02:17:27PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/atomisp/TODO > > between commit: > > 51b8dc5163d2 ("media: staging: atomisp: Remove driver") > > from the v4l-dvb tree

linux-next: manual merge of the staging tree with the v4l-dvb tree

2018-05-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/media/atomisp/TODO between commit: 51b8dc5163d2 ("media: staging: atomisp: Remove driver") from the v4l-dvb tree and commit: 1bd421154821 ("staging: atomisp: Augment TODO file with GPIO work item")

linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-11-01 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c between commit: 309167b966b6 ("media: staging: atomisp: cleanup out of memory messages") from the v4l-dvb tree and commit: 63342e75e661 ("Staging: media:

linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-04-10 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got conflicts in: drivers/staging/media/Kconfig drivers/staging/media/Makefile between commits: fc4e009c6c98 ("[media] stih-cec: add CEC notifier support") a93d429b51fb ("[media] s5p-cec: add cec-notifier support, move out of

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-04-06 Thread Stephen Rothwell
Hi Sean, On Thu, 6 Apr 2017 21:39:05 +0100 Sean Young wrote: > > I think this is happening: > > On the v4l-dvb tree, 5cd6522 modifies both lirc_sasem.c and lirc_sir.c; > then both files are removed. Now 87ddb91067b9 is merged from the staging > tree and both files don't exist any

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-04-06 Thread Sean Young
On Thu, Apr 06, 2017 at 09:19:22PM +0200, Greg KH wrote: > On Thu, Apr 06, 2017 at 07:58:57PM +0100, Sean Young wrote: > > On Thu, Apr 06, 2017 at 01:34:20PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the staging tree got conflicts in: > > > > > >

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-04-06 Thread Greg KH
On Thu, Apr 06, 2017 at 07:58:57PM +0100, Sean Young wrote: > On Thu, Apr 06, 2017 at 01:34:20PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the staging tree got conflicts in: > > > > drivers/staging/media/lirc/lirc_sasem.c > >

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-04-06 Thread Sean Young
On Thu, Apr 06, 2017 at 01:34:20PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/media/lirc/lirc_sasem.c > drivers/staging/media/lirc/lirc_sir.c > > between commits: > > e66267161971 ("[media] rc: promote

linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-04-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the staging tree got conflicts in: drivers/staging/media/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sir.c between commits: e66267161971 ("[media] rc: promote lirc_sir out of staging") 51bb3fd788cb ("[media] staging: lirc_sasem: remove") from

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-02-06 Thread Greg KH
On Mon, Feb 06, 2017 at 03:31:51PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/lirc/lirc_parallel.c > > between commit: > > 2933974cbb03 ("[media] staging: lirc_parallel: remove") > > from the

linux-next: manual merge of the staging tree with the v4l-dvb tree

2017-02-05 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/media/lirc/lirc_parallel.c between commit: 2933974cbb03 ("[media] staging: lirc_parallel: remove") from the v4l-dvb tree and commit: 1c5fa1c7dbff ("staging: media: lirc: use new parport device

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2016-03-04 Thread Greg KH
On Fri, Mar 04, 2016 at 04:24:44PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/media/dvb-frontends/mn88473.c > > between commit: > > 7908fad99a6c ("[media] mn88473: finalize driver") > > from the v4l-dvb tree

linux-next: manual merge of the staging tree with the v4l-dvb tree

2016-03-03 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/media/dvb-frontends/mn88473.c between commit: 7908fad99a6c ("[media] mn88473: finalize driver") from the v4l-dvb tree and commit: 3a35be2a1443 ("staging: media: Remove unneeded parentheses") from the

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2015-05-11 Thread Greg KH
On Mon, May 11, 2015 at 03:28:04PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/dt3155v4l/dt3155v4l.c between commit cc11b140c3f1 ([media] dt3155: move out of staging into drivers/media/pci) from the v4l-dvb

linux-next: manual merge of the staging tree with the v4l-dvb tree

2015-05-10 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/dt3155v4l/dt3155v4l.c between commit cc11b140c3f1 ([media] dt3155: move out of staging into drivers/media/pci) from the v4l-dvb tree and commit ec80e2428046 (staging: dt3155v4l: remove unused including

linux-next: manual merge of the staging tree with the v4l-dvb tree

2015-03-23 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/mn88473/mn88473.c between commit 3b786f131645 ([media] mn88473: calculate the IF register values) from the v4l-dvb tree and commit b4c2c314c140 (Staging: media: mn88473: Match alignment with open

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-11-24 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/omap24xx/tcm825x.c between commit db85a0403be4 ([media] omap24xx/tcm825x: remove deprecated omap2 camera drivers) from the v4l-dvb tree and commit 1002a240ed72 (staging: media: omap24xx: Use min_t

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-11-24 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/omap24xx/omap24xxcam.c between commit db85a0403be4 ([media] omap24xx/tcm825x: remove deprecated omap2 camera drivers) from the v4l-dvb tree and commits cfafe92c1e94 (staging: media: omap24xx: Remove

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-11-05 Thread Greg KH
On Wed, Nov 05, 2014 at 03:29:11PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/lirc/lirc_imon.c between commit f3a75505ab5f ([media] Staging: media: lirc: cleaned up packet dump in 2 files) from the v4l-dvb

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-11-04 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/lirc/lirc_imon.c between commit f3a75505ab5f ([media] Staging: media: lirc: cleaned up packet dump in 2 files) from the v4l-dvb tree and commit 732ba199ab07 (staging: media: lirc: lirc_imon.c: replace

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-11-04 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/lirc/lirc_igorplugusb.c between commit 3e5907e695f2 ([media] lirc_igorplugusb: remove) from the v4l-dvb tree and commit d82e62deb51b (staging: media: lirc: Remove useless cast on void pointer) from the

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-11-04 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/lirc/lirc_sasem.c between commit f3a75505ab5f ([media] Staging: media: lirc: cleaned up packet dump in 2 files) from the v4l-dvb tree and commit eca6a8872a04 (staging: media: lirc: Use pr_* instead of

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-07-16 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/sn9c102/Kconfig between commit c0e11a2a24db ([media] sn9c102: remove deprecated driver) from the v4l-dvb tree and commit cfa880069d09 (staging: sn9c102 depends on USB) from the staging tree. I fixed it

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-07-16 Thread Greg KH
On Wed, Jul 16, 2014 at 04:46:54PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/sn9c102/Kconfig between commit c0e11a2a24db ([media] sn9c102: remove deprecated driver) from the v4l-dvb tree and commit

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-21 Thread Grant Likely
On Wed, 19 Mar 2014 08:30:08 -0700, Greg KH g...@kroah.com wrote: On Mon, Mar 17, 2014 at 10:27:36PM +, Russell King wrote: However, I still find myself coming back to a fundamental question: why were these bindings fine in April 2013, passed review, and were acked, but not fine today.

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-21 Thread Grant Likely
On Fri, Mar 21, 2014 at 12:24 PM, Grant Likely grant.lik...@linaro.org wrote: On Wed, 19 Mar 2014 08:30:08 -0700, Greg KH g...@kroah.com wrote: On Mon, Mar 17, 2014 at 10:27:36PM +, Russell King wrote: However, I still find myself coming back to a fundamental question: why were these

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-19 Thread Greg KH
On Mon, Mar 17, 2014 at 10:27:36PM +, Russell King wrote: However, I still find myself coming back to a fundamental question: why were these bindings fine in April 2013, passed review, and were acked, but not fine today. Here's the links to the emails acking their introduction which

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-18 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/msi3101/sdr-msi3101.c between commit 3d0c8fa3c5a0 ([media] msi3101: convert to SDR API) from the v4l-dvb tree and commit 6e878c0299c1 (staging: media/msi3101/sdr-msi3101.c removed warning) from the

linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/media/platform/exynos4-is/fimc-is.c between commit d265d9ac6c7c ([media] exynos4-is: Use external s5k6a3 sensor driver) from the v4l-dvb tree and commit fd9fdb78a9bf ([media] of: move graph helpers from

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-17 Thread Mauro Carvalho Chehab
Em Mon, 17 Mar 2014 18:55:42 +1100 Stephen Rothwell s...@canb.auug.org.au escreveu: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/media/platform/exynos4-is/fimc-is.c between commit d265d9ac6c7c ([media] exynos4-is: Use external s5k6a3 sensor driver) from

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-17 Thread Greg KH
On Mon, Mar 17, 2014 at 08:01:22AM -0300, Mauro Carvalho Chehab wrote: Em Mon, 17 Mar 2014 18:55:42 +1100 Stephen Rothwell s...@canb.auug.org.au escreveu: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/media/platform/exynos4-is/fimc-is.c between commit

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-17 Thread Mauro Carvalho Chehab
Em Mon, 17 Mar 2014 11:29:53 -0700 Greg KH g...@kroah.com escreveu: On Mon, Mar 17, 2014 at 08:01:22AM -0300, Mauro Carvalho Chehab wrote: Em Mon, 17 Mar 2014 18:55:42 +1100 Stephen Rothwell s...@canb.auug.org.au escreveu: Hi Greg, Today's linux-next merge of the staging tree

Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

2014-03-17 Thread Russell King
On Mon, Mar 17, 2014 at 04:29:37PM -0300, Mauro Carvalho Chehab wrote: Em Mon, 17 Mar 2014 11:29:53 -0700 Greg KH g...@kroah.com escreveu: On Mon, Mar 17, 2014 at 08:01:22AM -0300, Mauro Carvalho Chehab wrote: Em Mon, 17 Mar 2014 18:55:42 +1100 Stephen Rothwell s...@canb.auug.org.au