Messages in this thread | | | Date | Mon, 10 Feb 2014 15:00:47 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the rcu tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in mm/slub.c between commit f4e40a71719d ("slub: Fix add_full() lockdep checks") from the rcu tree and commit aee03fe7a7c8 ("mm/slub.c: list_lock may not be held in some circumstances") from the akpm-current tree.
These patches try to achieve the same thing, so I arbitrarily chose the version from the akpm-current tree.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |