On Tue, May 7, 2013 at 8:48 PM, Linus Torvalds
wrote:
> The ARM history has gotten much much better, but it's full of these
> kinds of incestuous merges. The pull requests I get are not truly
> independent development, although especially the early pull requests
> are much less tightly coupled th
On Tue, May 7, 2013 at 8:17 PM, Tony Lindgren wrote:
>
> Yes then we patched it on Sunday, and Arnd merged it into his branch.
> But then hose lines disappeared again for the third time :)
Yes, but that's because it's entirely pointless to "fix" things in the
wrong branch, especially after a back
* Linus Torvalds [130507 18:05]:
> On Tue, May 7, 2013 at 4:19 PM, Tony Lindgren wrote:
> >
> >> Vaibhav Hiremath (1):
> >> ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
> >
> > Turns out this urgent boot fix got undone in the merge somehow.
>
> Those lines actually d
On Tue, May 7, 2013 at 4:19 PM, Tony Lindgren wrote:
>
>> Vaibhav Hiremath (1):
>> ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
>
> Turns out this urgent boot fix got undone in the merge somehow.
Those lines actually disappeared already much earlier in my merge 6fa52e
Linus,
* Arnd Bergmann [130507 10:32]:
> The following changes since commit
>
>763e6b9 Merge tag 'dt-for-linus-2' into for-next
>
> are available in the git repository at
>
>git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
> tags/cleanup-for-linus-2
...
> Vaibhav Hirema
These are cleanups and smaller changes that either depend on earlier
feature branches or came in late during the development cycle.
We normally try to get all cleanups early, so these are the exceptions:
- A follow-up on the clocksource reworks, hopefully the last time
we need to merge clocksour
6 matches
Mail list logo
