From: Arnd Bergmann <arnd@arndb.de> To: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>, Olof Johansson <olof@lixom.net>, Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus <torvalds@linux-foundation.org>, linux-arm-kernel@lists.infradead.org, Nicolas Ferre <nicolas.ferre@atmel.com> Subject: Re: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Date: Wed, 11 Jan 2012 14:50:02 +0000 [thread overview] Message-ID: <201201111450.02798.arnd@arndb.de> (raw) In-Reply-To: <4F0D65F6.8080209@infradead.org> On Wednesday 11 January 2012, Mauro Carvalho Chehab wrote: > What I and Guennadi agreed (http://linuxtv.org/irc/v4l/index.php?date=2012-01-05) > were to do just the reverse: > > He would be sending you one single patch with my ack, that would allow the > arm tree to be merged [1], I would wait for a few days for the arm tree to > be pulled, and then I would rebase my -next tree to remove that patch > from it. > > [1] http://git.linuxtv.org/gliakhovetski/v4l-dvb.git/commitdiff/88c6599d97b489ac543fa352159a81f60bddded7 It's just not what happened. I got this series from Nicolas: 7a1834b ARM: at91: Update struct atmel_nand_data to support PMECC 9356fba ARM: at91/dma: DMA controller registering with DT support 31527e7 ARM: at91/dma: remove platform data from DMA controller 226e3aa ARM: at91: add Atmel ISI and ov2640 support on sam9m10g45 board e889a64 ARM: at91: add clock selection parameter for at91_add_device_isi() 7a13e73 media i.MX27 camera: Fix field_count handling. 166b37f media i.MX27 camera: add support for YUV420 format. 88c6599 V4L: atmel-isi: add code to enable/disable ISI_MCK clock ... (the rest of v4l at the time) and I merged it into the next/drivers2 branch, explaining that I would merge these as soon as the dependencies in v4l are merged. :( > My -next tree were never meant to be stable. It is just a patch repository > where I merge from the real development repository, in order to test them > against the hole changes. From time to time, when bad things happen > (patch conflicts, compilation breakages, requests to remove bad patches), > I just rebase it. Ok, thanks for the confirmation. > I prefer if you could just pick this patch from Guennadi's tree: > http://git.linuxtv.org/gliakhovetski/v4l-dvb.git/commitdiff/88c6599d97b489ac543fa352159a81f60bddded7 > > and add my ack on it, removing the v4l-dvb merge from yours. > > Linus seems to prefer to have the arch trees merged before the drivers > tree, with makes sense. I think it's better for you to just send everything you have right away, including the atmel-isi patch. I'll drop the remaining atmel patches from my next/drivers2 branch and let Nicolas send me a new rebased pull request for 3.4. The patches in question look simple enough, but if the developers can't get a simple dependency right after discussing it for weeks, I'd rather not take it this time. Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Date: Wed, 11 Jan 2012 14:50:02 +0000 [thread overview] Message-ID: <201201111450.02798.arnd@arndb.de> (raw) In-Reply-To: <4F0D65F6.8080209@infradead.org> On Wednesday 11 January 2012, Mauro Carvalho Chehab wrote: > What I and Guennadi agreed (http://linuxtv.org/irc/v4l/index.php?date=2012-01-05) > were to do just the reverse: > > He would be sending you one single patch with my ack, that would allow the > arm tree to be merged [1], I would wait for a few days for the arm tree to > be pulled, and then I would rebase my -next tree to remove that patch > from it. > > [1] http://git.linuxtv.org/gliakhovetski/v4l-dvb.git/commitdiff/88c6599d97b489ac543fa352159a81f60bddded7 It's just not what happened. I got this series from Nicolas: 7a1834b ARM: at91: Update struct atmel_nand_data to support PMECC 9356fba ARM: at91/dma: DMA controller registering with DT support 31527e7 ARM: at91/dma: remove platform data from DMA controller 226e3aa ARM: at91: add Atmel ISI and ov2640 support on sam9m10g45 board e889a64 ARM: at91: add clock selection parameter for at91_add_device_isi() 7a13e73 media i.MX27 camera: Fix field_count handling. 166b37f media i.MX27 camera: add support for YUV420 format. 88c6599 V4L: atmel-isi: add code to enable/disable ISI_MCK clock ... (the rest of v4l at the time) and I merged it into the next/drivers2 branch, explaining that I would merge these as soon as the dependencies in v4l are merged. :( > My -next tree were never meant to be stable. It is just a patch repository > where I merge from the real development repository, in order to test them > against the hole changes. From time to time, when bad things happen > (patch conflicts, compilation breakages, requests to remove bad patches), > I just rebase it. Ok, thanks for the confirmation. > I prefer if you could just pick this patch from Guennadi's tree: > http://git.linuxtv.org/gliakhovetski/v4l-dvb.git/commitdiff/88c6599d97b489ac543fa352159a81f60bddded7 > > and add my ack on it, removing the v4l-dvb merge from yours. > > Linus seems to prefer to have the arch trees merged before the drivers > tree, with makes sense. I think it's better for you to just send everything you have right away, including the atmel-isi patch. I'll drop the remaining atmel patches from my next/drivers2 branch and let Nicolas send me a new rebased pull request for 3.4. The patches in question look simple enough, but if the developers can't get a simple dependency right after discussing it for weeks, I'd rather not take it this time. Arnd
next prev parent reply other threads:[~2012-01-11 14:50 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-01-11 2:31 linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Stephen Rothwell 2012-01-11 2:31 ` Stephen Rothwell 2012-01-11 2:31 ` Stephen Rothwell 2012-01-11 5:08 ` Olof Johansson 2012-01-11 5:08 ` Olof Johansson 2012-01-11 8:36 ` Guennadi Liakhovetski 2012-01-11 8:36 ` Guennadi Liakhovetski 2012-01-11 10:35 ` Mauro Carvalho Chehab 2012-01-11 10:35 ` Mauro Carvalho Chehab 2012-01-11 14:50 ` Arnd Bergmann [this message] 2012-01-11 14:50 ` Arnd Bergmann 2012-01-11 15:09 ` Olof Johansson 2012-01-11 15:09 ` Olof Johansson 2012-01-11 15:57 ` Nicolas Ferre 2012-01-11 15:57 ` Nicolas Ferre 2012-01-11 16:44 ` Olof Johansson 2012-01-11 16:44 ` Olof Johansson 2012-01-11 20:47 ` Mauro Carvalho Chehab 2012-01-11 20:47 ` Mauro Carvalho Chehab 2012-01-11 16:46 ` Arnd Bergmann 2012-01-11 16:46 ` Arnd Bergmann 2012-01-11 16:58 ` Olof Johansson 2012-01-11 16:58 ` Olof Johansson 2012-01-11 17:56 ` Guennadi Liakhovetski 2012-01-11 17:56 ` Guennadi Liakhovetski 2012-01-12 11:42 ` [GIT PULL v3] at91: devices and boards files update for 3.3 Nicolas Ferre 2014-11-24 2:22 linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Stephen Rothwell 2014-11-24 2:22 ` Stephen Rothwell 2014-11-24 2:22 ` Stephen Rothwell 2014-11-24 15:28 ` Tony Lindgren 2014-11-24 15:28 ` Tony Lindgren 2014-12-01 2:52 Stephen Rothwell 2014-12-01 2:52 ` Stephen Rothwell 2014-12-01 2:52 ` Stephen Rothwell 2014-12-05 3:03 Stephen Rothwell 2014-12-05 3:03 ` Stephen Rothwell 2014-12-05 3:03 ` Stephen Rothwell 2015-12-02 13:36 Mark Brown 2015-12-02 13:36 ` Mark Brown 2017-08-22 0:55 Stephen Rothwell 2017-08-22 0:55 ` Stephen Rothwell 2017-09-04 5:23 ` Stephen Rothwell 2017-09-04 5:23 ` Stephen Rothwell 2020-12-08 0:04 Stephen Rothwell 2020-12-08 0:04 ` Stephen Rothwell 2020-12-14 20:30 ` Stephen Rothwell 2020-12-14 20:30 ` Stephen Rothwell 2020-12-14 21:05 ` Mauro Carvalho Chehab 2020-12-14 21:05 ` Mauro Carvalho Chehab
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=201201111450.02798.arnd@arndb.de \ --to=arnd@arndb.de \ --cc=g.liakhovetski@gmx.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=mchehab@infradead.org \ --cc=nicolas.ferre@atmel.com \ --cc=olof@lixom.net \ --cc=sfr@canb.auug.org.au \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.