diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 07:42:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 07:42:58 -0700 |
commit | 7e599e6e62759e057e902fcf9a05ba24f6155bcd (patch) | |
tree | c546d89105deaadfe961133fed6fd0b84f66ab6f /drivers/pcmcia | |
parent | 3a80e52486eff1221ece5902b423da59f263069d (diff) | |
download | op-kernel-dev-7e599e6e62759e057e902fcf9a05ba24f6155bcd.zip op-kernel-dev-7e599e6e62759e057e902fcf9a05ba24f6155bcd.tar.gz |
drbd: fix up merge error
In commit 95a0f10cddbf ("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 c4945b9ed472
("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 8d49a77568d1: "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: Ingo Molnar <mingo@elte.hu>
Cc: Jens Axboe <jaxboe@fusionio.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions