Messages in this thread | | | Date | Sun, 9 Feb 2014 21:24:43 -0800 | From | "Paul E. McKenney" <> | Subject | Re: linux-next: manual merge of the akpm-current tree with the rcu tree |
| |
On Mon, Feb 10, 2014 at 03:00:47PM +1100, Stephen Rothwell wrote: > 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.
My bad -- I forgot to remove my version.
Thanx, Paul
| |