Messages in this thread | | | Date | Thu, 23 Jan 2014 16:04:56 -0800 | From | "H. Peter Anvin" <> | Subject | Re: [GIT PULL] regulator updates for v3.13-rc1 |
| |
On 01/21/2014 11:16 AM, Linus Torvalds wrote: > On Mon, Nov 25, 2013 at 4:39 PM, Mark Brown <broonie@kernel.org> wrote: >> >> If you're OK with octopus merges for things like this I'll definitely >> take another look at using them, the enormous stack of merge commits >> always looks noisy to me in the logs and pull requests and for things >> like driver updates there's unlikely to be much doubt about which branch >> it was if there's a problem. > > Christ. When you start doing octopus merges, you don't do it by half > measures, do you? > > I just pulled the sound updates from Takashi, and as a result got your > merge commit 2cde51fbd0f3. That one has 66 parents. >
For sheer amusement value: the tip-bot uses a private git tree to keep track of what it has mailed and not mailed. At least once it produced a 243-input octopus merge.
-hpa
| |