Messages in this thread | | | Date | Tue, 10 Apr 2012 10:38:50 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tile tree with Linus' tree |
| |
Hi Chris,
Today's linux-next merge of the tile tree got a conflict in arch/tile/kernel/stack.c between commit 5f639fdcd8c1 (arch/tile: various bugs in stack backtracer"") from Linus' tree and commit aa127c855d1e ("arch/tile: Allow tilegx to build with either 16K or 64K page size") from the tile tree.
The former removed the code modified by the latter, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |