• Linus Torvalds's avatar
    drbd: fix up merge error · 7e599e6e
    Linus Torvalds authored
    In commit 95a0f10c ("drbd: store in-core bitmap little endian,
    regardless of architecture") drbd had made the sane choice to use
    little-endian bitmap functions everywhere.  However, it used the
    horrible old functions names from <asm-generic/bitops/le.h>, that were
    never really meant to be exported.
    
    In the meantime, things got cleaned up, and in commit c4945b9e
    ("asm-generic: rename generic little-endian bitops functions") we
    renamed the LE bitops to something sane, exactly so that they could be
    used in random code without people gouging their eyes out when seeing
    the crazy jumble of letters that were the old internal names.
    
    As a result the drbd thing merged cleanly (commit 8d49a775: "Merge
    branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block"),
    since there was no data conflict - but the end result obviously doesn't
    actually compile.
    Reported-and-tested-by: default avatarIngo Molnar <mingo@elte.hu>
    Cc: Jens Axboe <jaxboe@fusionio.com>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    7e599e6e
drbd_bitmap.c 44.3 KB