davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
d5627663f2
kernel-ark/drivers/block/drbd
History
Linus Torvalds 7e599e6e62 drbd: fix up merge error 
In commit 95a0f10cdd ("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 c4945b9ed4
("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 8d49a77568: "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>
2011-03-28 07:42:58 -07:00
..
drbd_actlog.c drbd: Remove unused function atodb_endio() 2011-03-10 11:48:15 +01:00
drbd_bitmap.c drbd: fix up merge error 2011-03-28 07:42:58 -07:00
drbd_int.h drbd: Implemented real timeout checking for request processing time 2011-03-10 11:48:16 +01:00
drbd_main.c drbd: Implemented real timeout checking for request processing time 2011-03-10 11:48:16 +01:00
drbd_nl.c Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block 2011-03-27 20:02:07 -07:00
drbd_proc.c drbd: allow petabyte storage on 64bit arch 2011-03-10 11:43:24 +01:00
drbd_receiver.c drbd: Implemented real timeout checking for request processing time 2011-03-10 11:48:16 +01:00
drbd_req.c drbd: drop code present under #ifdef which is relevant to 2.6.28 and below 2011-03-10 11:48:21 +01:00
drbd_req.h drbd: Implemented real timeout checking for request processing time 2011-03-10 11:48:16 +01:00
drbd_strings.c drbd: Rename enum drbd_state_ret_codes to enum drbd_state_rv 2011-03-10 11:36:18 +01:00
drbd_vli.h The DRBD driver 2009-10-01 21:17:49 +02:00
drbd_worker.c drbd: Fixed handling of read errors on a 'VerifyS' node 2011-03-10 11:48:20 +01:00
drbd_wrappers.h drbd: Get rid of unnecessary macros (2) 2011-03-10 11:36:15 +01:00
Kconfig drbd: Kconfig fix 2009-12-29 17:38:28 +01:00
Makefile drbd: remove tracing bits 2009-10-01 21:17:58 +02:00