[lkml]   [2012]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the akpm tree with the rr tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/s390/Kconfig arch/x86/Kconfig between commit 380470027b5c ("Make
most arch asm/module.h files use asm-generic/module.h") from the rr tree
and commit 3fcc9766e733 ("atomic64_test: simplify the #ifdef for
atomic64_dec_if_positive() test") from the akpm tree.

Just context changes. I fixed it up and can carry it as necessary.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-07-26 07:02    [W:0.035 / U:3.844 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site