Messages in this thread | | | Date | Tue, 21 May 2013 14:29:48 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the net-next tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can call module_free() from any context") from the net-next tree and commit "bpf: add comments explaining the schedule_work() operation" from the akpm tree.
The former means that the latter is no longer required, so I used the former 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] | |