Messages in this thread | | | Date | Mon, 18 Feb 2013 14:35:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the kbuild tree |
| |
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |