Messages in this thread | | | Date | Thu, 14 Feb 2013 15:25:15 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in kernel/timeconst.pl between commit 63a3f603413f ("timeconst.pl: Eliminate Perl warning") from the tip tree and commit "timeconst.pl: remove deprecated defined(@array)" from the akpm tree.
These both fix the same problem, I arbitrarily chose the akpm tree version.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |