Messages in this thread | | | Date | Tue, 28 Jan 2014 18:44:31 -0800 | Subject | Re: [GIT PULL] clk: changes for 3.14, part 2 | From | Linus Torvalds <> |
| |
On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette <mturquette@linaro.org> 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.
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.
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/
| |