On Wed, Jan 29, 2014 at 9:33 PM, Kevin Hilman <[email protected]> wrote: > On Wed, Jan 29, 2014 at 4:19 PM, Stephen Rothwell <[email protected]> > wrote: >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> drivers/clk/Makefile between commit fd3fdaf09f26 ("clk: sort Makefile") >> from Linus' tree and commit 7ee2c5117483 ("clk: bcm281xx: add initial >> clock framework support") from the arm-soc tree. > > Ugh. Looks like some last minute cleanup stuff went into clk-next > that didn't spend time in linux-next, and now causes conflicts with > some clk stuff we still have queued in arm-soc (ack'd by Mike.) > > Now, based on the Hulk's response to Mike's pull request, if we submit > this, introducing yet more conflicts in the Makefile, it will surely > be Hulk angry, Hulk smash.
Well this is clearly my fault. Please place appropriate blame on me for sneaking in that Makefile cleanup. /me prepares to be smashed. Regards, Mike > > Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
