On Mon, 2009-07-06 at 14:40 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in
> include/linux/rcupdate.h between commit
> 249acdd3fd13d1ec579ff9b1c5273cf5515cd352 ("SLQB slab allocator (try 2)")
> from the slab tree and commit 03b042bf1dc14a268a3d65d38b4ec2a4261e8477
> ("rcu: Add synchronize_sched_expedited() primitive") from the tip tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yup, looks good to me. Thanks, Stephen!
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
