Re: [PATCH] kconfig: Avoid buffer underrun in choice input

[Linus Torvalds]

On Wed, Apr 27, 2011 at 4:19 AM, Michal Marek <mmarek@xxxxxxx> wrote:
>
> I applied this on 8th April, see
> http://www.spinics.net/lists/linux-kbuild/msg04431.html. Please check
> linux-next before reposting patches next time, now I either have to rewind
> the kconfig branch or let Linus merge it with a duplicate commit :-(.

Merging the occasional duplicate is normal flow, don't worry about it.
I'd much rather see the occasional smaller diffstat due to a diff that
got applied in both sides than I'd see people rebasing just to avoid
some silly duplicate.

It's if two branches consistently have many duplicates that I react,
because it tends to be some systematic error (often excessive
rebasing, but it could be some "ownership" argument too)

The "occasionally the same fix made it through two different trees" is
not just normal, it's _expected_ in distributed development. If it
never happens, that's a sign that people are serializing overmuch.

                                   Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/