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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got conflicts in a large
number of files between commits from the arm-soc tree and commits from the
v4l-dvb tree.  You have rebased the v4l-dvb tree onto v3.2 while the
arm-soc tree had merged a previous version. you have then added a lot
more commits on top of the result - which produces all the conflicts.  :-(

This is exactly the sort of pain I alluded to when I first noted that the
v4l-dvb tree had been merged into the arm-soc tree ...

Not happy.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Olof Johansson]

On Tue, Jan 10, 2012 at 6:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got conflicts in a large
> number of files between commits from the arm-soc tree and commits from the
> v4l-dvb tree.  You have rebased the v4l-dvb tree onto v3.2 while the
> arm-soc tree had merged a previous version. you have then added a lot
> more commits on top of the result - which produces all the conflicts.  :-(
>
> This is exactly the sort of pain I alluded to when I first noted that the
> v4l-dvb tree had been merged into the arm-soc tree ...

We do this every now and then though, it's not an issue as long as
nothing stupid is done with the dependent branch at the other end.
I.e. if it's actually a stable branch (which we got promised that it
was).

So, why was the whole v4l tree rebased? Guennadi, you said it was
going to be a stable branch? What happened?

> Not happy.

No kidding.  Mauro, can you undo your rebase or should I remove the
dependent branch (and the at91 branch that needs it) from arm-soc
instead?


-Olof

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

[Guennadi Liakhovetski]

On Tue, 10 Jan 2012, Olof Johansson wrote:

> On Tue, Jan 10, 2012 at 6:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Mauro,
> >
> > Today's linux-next merge of the v4l-dvb tree got conflicts in a large
> > number of files between commits from the arm-soc tree and commits from the
> > v4l-dvb tree.  You have rebased the v4l-dvb tree onto v3.2 while the
> > arm-soc tree had merged a previous version. you have then added a lot
> > more commits on top of the result - which produces all the conflicts.  :-(
> >
> > This is exactly the sort of pain I alluded to when I first noted that the
> > v4l-dvb tree had been merged into the arm-soc tree ...
> 
> We do this every now and then though, it's not an issue as long as
> nothing stupid is done with the dependent branch at the other end.
> I.e. if it's actually a stable branch (which we got promised that it
> was).
> 
> So, why was the whole v4l tree rebased? Guennadi, you said it was
> going to be a stable branch? What happened?

Sorry, I don't think I _promised_ anything, I even don't think I said 
anything at all about the stability of that branch. On the contrary - I 
suggested you to only take _one_ patch, about which we knew, that some ARM 
patches depended upon, for which I've got Mauro's ack. This has been done 
with the sole purpose for you to avoid any dependencies. Instead you 
decided to pull the whole branch.

> > Not happy.
> 
> No kidding.  Mauro, can you undo your rebase or should I remove the
> dependent branch (and the at91 branch that needs it) from arm-soc
> instead?

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

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

[Mauro Carvalho Chehab]

On 11-01-2012 06:36, Guennadi Liakhovetski wrote:
> On Tue, 10 Jan 2012, Olof Johansson wrote:
> 
>> On Tue, Jan 10, 2012 at 6:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> Hi Mauro,
>>>
>>> Today's linux-next merge of the v4l-dvb tree got conflicts in a large
>>> number of files between commits from the arm-soc tree and commits from the
>>> v4l-dvb tree.  You have rebased the v4l-dvb tree onto v3.2 while the
>>> arm-soc tree had merged a previous version. you have then added a lot
>>> more commits on top of the result - which produces all the conflicts.  :-(
>>>
>>> This is exactly the sort of pain I alluded to when I first noted that the
>>> v4l-dvb tree had been merged into the arm-soc tree ...
>>
>> We do this every now and then though, it's not an issue as long as
>> nothing stupid is done with the dependent branch at the other end.
>> I.e. if it's actually a stable branch (which we got promised that it
>> was).
>>
>> So, why was the whole v4l tree rebased? Guennadi, you said it was
>> going to be a stable branch? What happened?
> 
> Sorry, I don't think I _promised_ anything, I even don't think I said 
> anything at all about the stability of that branch. On the contrary - I 
> suggested you to only take _one_ patch, about which we knew, that some ARM 
> patches depended upon, for which I've got Mauro's ack. This has been done 
> with the sole purpose for you to avoid any dependencies. Instead you 
> decided to pull the whole branch.

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

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.

The media stable tree is stored elsewhere, but it contains the sort of patches
that Linus once asked me to not send him: merge patches from upstream
that are sometimes needed, due to some conflict dependencies. This time,
there are two of such patches inside my tree. That's a second reason
for me to rebase.

>>> Not happy.
>>
>> No kidding.  Mauro, can you undo your rebase or should I remove the
>> dependent branch (and the at91 branch that needs it) from arm-soc
>> instead?

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.

Regards,
Mauro
> 
> Thanks
> Guennadi
> ---
> Guennadi Liakhovetski, Ph.D.
> Freelance Open-Source Software Developer
> http://www.open-technology.de/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Arnd Bergmann]

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

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

[Olof Johansson]

Hi,

On Wed, Jan 11, 2012 at 6:50 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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.

Sounds good to me.


-Olof

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

[Nicolas Ferre]

On 01/11/2012 03:50 PM, Arnd Bergmann :
> 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.

I am so astonished and sad about all this! I have the feeling of having
done exactly what Guennadi and Olof had asked me to do: What I get at
the end: people having a bad feeling about my work, not expected merge
conflicts which annoy everybody (only for a ridiculous amount of code),
my patches delayed and a comment saying that I cannot handle simple
dependency...
Nice result!

- Guennadi did not want to take SoC/board code in his tree
=> I had to take those lines of code through at91/arm-soc breaking the
   patch series and allowing the introduction of an out-of-sync merge

- I built a pull request with only the SoC/board code on top of a
  Linus' -rc tag (yes, that was breaking compilation on certain
  configurations in the meantime)
=> I was told that I should bring the v4l dependency with my branch

- I resent a "pull request" on top of v4l branch after a discussion
  between Guennadi, Olof and me. The conclusion of this discussion was
  quite obvious:
http://article.gmane.org/gmane.linux.ports.arm.kernel/145196
=> It was supposed to be the last time I moved those patches around...

I have understood and approved all the reasons for the requested
changes, of course. But for which gain?

Ok... well, it looks like a massive incomprehension which took us time
and ends up by wastefulness.

Best regards,
-- 
Nicolas Ferre

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

[Olof Johansson]

Hi,

On Wed, Jan 11, 2012 at 7:57 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> On 01/11/2012 03:50 PM, Arnd Bergmann :
>> 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.
>
> I am so astonished and sad about all this! I have the feeling of having
> done exactly what Guennadi and Olof had asked me to do: What I get at
> the end: people having a bad feeling about my work, not expected merge
> conflicts which annoy everybody (only for a ridiculous amount of code),
> my patches delayed and a comment saying that I cannot handle simple
> dependency...
> Nice result!

Personally, I don't blame you in this case, you're the victim.

> - Guennadi did not want to take SoC/board code in his tree
> => I had to take those lines of code through at91/arm-soc breaking the
>   patch series and allowing the introduction of an out-of-sync merge

It was actually me who said we prefer to take the board code through
arm-soc, and given how conflict-ridden this merge window has been, I
think that has been a good decision. Otherwise even more conflicts
would have needed to be resolved at Linus' pulls, and while he's OK
with doing some of them, we should still try to keep them at a
reasonable level.

> - I built a pull request with only the SoC/board code on top of a
>  Linus' -rc tag (yes, that was breaking compilation on certain
>  configurations in the meantime)
> => I was told that I should bring the v4l dependency with my branch

This is where things broke down. The one thing I told Guennadi was
that the branch that we merge in *must not be rebased*. In hindsight,
I should have asked him to stage a minimal topic branch with _just_
the patches you needed, and pulled that in as the dependency instead
of the whole v4l tree.

> - I resent a "pull request" on top of v4l branch after a discussion
>  between Guennadi, Olof and me. The conclusion of this discussion was
>  quite obvious:
> http://article.gmane.org/gmane.linux.ports.arm.kernel/145196
> => It was supposed to be the last time I moved those patches around...

Yep. The main problem is that the branch was not stable. Not your fault.

> I have understood and approved all the reasons for the requested
> changes, of course. But for which gain?
>
> Ok... well, it looks like a massive incomprehension which took us time
> and ends up by wastefulness.

If you prepare a branch with just your changes, I'll pull it in as a
late/* branch and we can try to get it merged in for 3.3. That
requires that Mauro gets his pull done with enough margin to get our
late merge request sorted out and sent in though. I.e. his tree would
need to go in soon, not next week right before the window closes.


-Olof

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

[Mauro Carvalho Chehab]

On 11-01-2012 14:44, Olof Johansson wrote:
> Hi,
> 
> On Wed, Jan 11, 2012 at 7:57 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>> On 01/11/2012 03:50 PM, Arnd Bergmann :
>>> 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.
>>
>> I am so astonished and sad about all this! I have the feeling of having
>> done exactly what Guennadi and Olof had asked me to do: What I get at
>> the end: people having a bad feeling about my work, not expected merge
>> conflicts which annoy everybody (only for a ridiculous amount of code),
>> my patches delayed and a comment saying that I cannot handle simple
>> dependency...
>> Nice result!
> 
> Personally, I don't blame you in this case, you're the victim.
> 
>> - Guennadi did not want to take SoC/board code in his tree
>> => I had to take those lines of code through at91/arm-soc breaking the
>>   patch series and allowing the introduction of an out-of-sync merge
> 
> It was actually me who said we prefer to take the board code through
> arm-soc, and given how conflict-ridden this merge window has been, I
> think that has been a good decision. Otherwise even more conflicts
> would have needed to be resolved at Linus' pulls, and while he's OK
> with doing some of them, we should still try to keep them at a
> reasonable level.
> 
>> - I built a pull request with only the SoC/board code on top of a
>>  Linus' -rc tag (yes, that was breaking compilation on certain
>>  configurations in the meantime)
>> => I was told that I should bring the v4l dependency with my branch
> 
> This is where things broke down. The one thing I told Guennadi was
> that the branch that we merge in *must not be rebased*. In hindsight,
> I should have asked him to stage a minimal topic branch with _just_
> the patches you needed, and pulled that in as the dependency instead
> of the whole v4l tree.
> 
>> - I resent a "pull request" on top of v4l branch after a discussion
>>  between Guennadi, Olof and me. The conclusion of this discussion was
>>  quite obvious:
>> http://article.gmane.org/gmane.linux.ports.arm.kernel/145196
>> => It was supposed to be the last time I moved those patches around...
> 
> Yep. The main problem is that the branch was not stable. Not your fault.
> 
>> I have understood and approved all the reasons for the requested
>> changes, of course. But for which gain?
>>
>> Ok... well, it looks like a massive incomprehension which took us time
>> and ends up by wastefulness.

Yes, unfortunately.

> If you prepare a branch with just your changes, I'll pull it in as a
> late/* branch and we can try to get it merged in for 3.3. That
> requires that Mauro gets his pull done with enough margin to get our
> late merge request sorted out and sent in though. I.e. his tree would
> need to go in soon, not next week right before the window closes.

I'm ready to send my pull request to Linus. I'll prepare the
pull request message and send it in the sequence.

Regards,
Mauro.

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

[Arnd Bergmann]

On Wednesday 11 January 2012, Nicolas Ferre wrote:
> I am so astonished and sad about all this! I have the feeling of having
> done exactly what Guennadi and Olof had asked me to do: What I get at
> the end: people having a bad feeling about my work, not expected merge
> conflicts which annoy everybody (only for a ridiculous amount of code),
> my patches delayed and a comment saying that I cannot handle simple
> dependency...
> Nice result!

I'm sorry for accusing you, you are right. You did exactly what was
agreed on in the mail thread, I just reread the history.

My impression is that Guennadi simply didn't know what he was doing
when he sent you a patch based on a branch that was clearly not
stable.

> - Guennadi did not want to take SoC/board code in his tree
> => I had to take those lines of code through at91/arm-soc breaking the
>    patch series and allowing the introduction of an out-of-sync merge

This was probably the first mistake. It would have been trivial
to handle all this if we had just stuck the same commit into both
trees.

> I have understood and approved all the reasons for the requested
> changes, of course. But for which gain?
> 
> Ok... well, it looks like a massive incomprehension which took us time
> and ends up by wastefulness.

Agreed. How about if you rebase the few other (non-ISI) patches that
I had in arm-soc onto v3.2 and send me an updated pull request so
I can send them on? There's no reason to hold them up.

	Arnd

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

[Olof Johansson]

On Wed, Jan 11, 2012 at 8:46 AM, Arnd Bergmann <arnd@arndb.de> wrote:

> Agreed. How about if you rebase the few other (non-ISI) patches that
> I had in arm-soc onto v3.2 and send me an updated pull request so
> I can send them on? There's no reason to hold them up.

Just to clarify: The late/* branch that I was referring to in my email
would just then contain the ISI patches, the rest would be in the
above branch.


-Olof

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

[Guennadi Liakhovetski]

On Wed, 11 Jan 2012, Arnd Bergmann wrote:

> My impression is that Guennadi simply didn't know what he was doing
> when he sent you a patch based on a branch that was clearly not
> stable.

I don't think I'm interested in discussing this here now. If you (or 
anyone for that matter) are interested, I can explain to you personally 
who, what and how screwed up, ok?

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

[GIT PULL v3] at91: devices and boards files update for 3.3

[Nicolas Ferre]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Arnd, Olof,

This is the pull request about devices and boards files already
sent for 3.3 inclusion. This pull request is *without* the ISI
board/devices
patches that has been discussed earlier.

I have also tested the merging of those patches on top of today Linus'
tree
and it is going smoothly.

Thank you for your patience and understanding.


The following changes since commit
805a6af8dba5dfdd35ec35dc52ec0122400b2610:

  Linux 3.2 (2012-01-04 15:55:44 -0800)

are available in the git repository at:
  git://github.com/at91linux/linux-at91.git for-arnd-3.3-device_boardV3

Hong Xu (1):
      ARM: at91: Update struct atmel_nand_data to support PMECC

Nicolas Ferre (2):
      ARM: at91/dma: remove platform data from DMA controller
      ARM: at91/dma: DMA controller registering with DT support

 arch/arm/mach-at91/at91sam9g45_devices.c |   19 ++++++++++---------
 arch/arm/mach-at91/at91sam9rl_devices.c  |    8 +-------
 arch/arm/mach-at91/include/mach/board.h  |    2 ++
 3 files changed, 13 insertions(+), 16 deletions(-)

Best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPDscLAAoJEAf03oE53VmQUt8H+wV6uiURUj6MXRgPYhUrE38H
quMt9Qse/drY3MOx6UjK4fJWprl+JRsyIlHRaa564vRf9W14uPpwMoyRwtgOUbf+
x3IYBh+SD0DJgx/4RHvMCNlD7/0dQ4HoMVxTC5J0S5McoIYXttWqxY7QC4cMaCwa
jwLFU3mWHCNe4WWkN9j18KBI7gUfW6CVzgJCS8RFBYV/ieN6BqWbKK341cJ7Ubrp
VfHRhXAubJV2S/RwoCSOYvbAcANv0/HnVel0AOFD77uzqq6qtoLMeDew8JbaZGDT
AwVWZg4Lt8iInpYeTuIAieNF0Z+VxWhOkLjhZovJ6kwoXgbbNFjzEMO4WL2Xkvg=
=C5kr
-----END PGP SIGNATURE-----