Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755913AbaA2D7T (ORCPT ); Tue, 28 Jan 2014 22:59:19 -0500 Received: from mail-lb0-f172.google.com ([209.85.217.172]:41891 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751631AbaA2D7S (ORCPT ); Tue, 28 Jan 2014 22:59:18 -0500 MIME-Version: 1.0 In-Reply-To: References: <20140127214338.4167.57312@quantum> From: Mike Turquette Date: Tue, 28 Jan 2014 19:58:56 -0800 Message-ID: Subject: Re: [GIT PULL] clk: changes for 3.14, part 2 To: Linus Torvalds Cc: Linux Kernel Mailing List Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 28, 2014 at 6:44 PM, Linus Torvalds wrote: > On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette wrote: >> >> git://git.linaro.org/people/mike.turquette/linux.git tags/clk-for-linus-3.14-part2 > > Dammit, this is pure shit, and after having to deal with yet another > pointless merge conflict due to stupid "cleanups" in Makefiles, IT > DOES NOT EVEN COMPILE. > > drivers/clk/clk-si5351.c: In function 'si5351_i2c_probe': > drivers/clk/clk-si5351.c:1314:2: error: too many arguments to function > 'si5351_dt_parse' > ret = si5351_dt_parse(client, variant); > ^ > drivers/clk/clk-si5351.c:1296:12: note: declared here > static int si5351_dt_parse(struct i2c_client *client) > > And no, that's not due to a merge error of mine. It was that way in your tree. > > Hulk angry. Hulk smash. My apologies for making you hulk out. I did sneak some stuff in at the end and it bit us in the ass. Thank you for fixing it up. > > I fixed it up in the merge, but I shouldn't need to. This should have > been caught in -next, and even if you compile for ARM as your primary > target, I know *damn* well that no sane ARM developer actually > compiles *on* ARM (because there are no machines where it's worth the > pain), so you should make sure that the x86-64 build works too. > > If I can find compile errors within a couple of minutes of pulling and > it's not a merge error of mine, the tree I'm pulling from is clearly > crap. > > So I'm more than a bit grumpy. Get your act together, and don't send > me any more shit. > > In fact, I would suggest you send nothing but obvious fixes from now > on in this release. Because I won't be taking anything else. I only send fixes for actual regressions after -rc1. Additionally this weird two-part pull request was an anomaly and I don't plan to do it again. Again thanks for your patience, Mike > > Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/