That is the right fix indeed. Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: >Hi all, > >Today's linux-next merge of the tip tree got a conflict in >kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace >timeconst.pl with a bc script") from the kbuild tree and commit >63a3f603413f ("timeconst.pl: Eliminate Perl warning") from the tip >tree. > >I just droppped the tip tree version (I deleted the file) and can carry >the fix as necessary (no action is required). -- Sent from my mobile phone. Please excuse brevity and lack of formatting. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html