From: Linus Torvalds <torvalds@linux-foundation.org>
To: Michal Marek <mmarek@suse.cz>
Cc: Ben Hutchings <ben@decadent.org.uk>,
LKML <linux-kernel@vger.kernel.org>,
linux-kbuild@vger.kernel.org,
Roman Zippel <zippel@linux-m68k.org>
Subject: Re: [PATCH] kconfig: Avoid buffer underrun in choice input
Date: Wed, 27 Apr 2011 10:35:49 -0700 [thread overview]
Message-ID: <BANLkTi=dbWOPcSqg5ueDzGJMoGDa9Bp3fA@mail.gmail.com> (raw)
In-Reply-To: <4DB7FBD8.20109@suse.cz>
On Wed, Apr 27, 2011 at 4:19 AM, Michal Marek <mmarek@suse.cz> 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
prev parent reply other threads:[~2011-04-27 17:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-23 17:42 Ben Hutchings
2011-04-23 18:04 ` Sam Ravnborg
2011-04-24 4:02 ` Ben Hutchings
2011-04-24 8:39 ` Geert Uytterhoeven
2011-04-27 11:19 ` Michal Marek
2011-04-27 13:12 ` Ben Hutchings
2011-04-27 17:35 ` Linus Torvalds [this message]
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='BANLkTi=dbWOPcSqg5ueDzGJMoGDa9Bp3fA@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=ben@decadent.org.uk \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=zippel@linux-m68k.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®