* Stephen Rothwell <[EMAIL PROTECTED]> wrote:
> Hi all,
>
> Today's linux-next merge of the x86-latest tree got a conflict in
> include/asm-powerpc/bitops.h between commit
> cd008c0f03f3d451e5fbd108b8e74079d402be64 ("generic: implement __fls on
> all 64-bit archs") from the x86-latest tree and commit
> 9f264be6101c42cb9e471c58322fb83a5cde1461 ("[POWERPC] Optimize fls64()
> on 64-bit processors") from the powerpc-next tree. The fixup was not
> quite trivial and is worth a look to see if I got it right.
Paul, do you agree with those generic bitops changes? Just in case it's
not obvious from previous discussions: we'll push them upstream via a
separate pull request, not via usual x86.git changes. They originated
from x86.git but grew into a more generic improvement for all. They sit
in x86.git for tester convenience but are of course not pure x86 changes
anymore.
Ingo
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
