'unlabeled-1.25.18'.

-   replace #if with #ifdef when checking config macros.
-   srpc_lnet_ev_handler expects LNET_LOCK to be held.

Whitespace cleanup.

i=deen
i=tianzy
the reply state was leaked in the no_reply case

i=Adilger
i=Wangdi

replay-ost-single CLEANUP fix.

i=brian
i=scjody
* Include disk1_4.zip in lustre-tests RPM

i=brian
i=scjody
* Include disk1_4.zip in lustre-tests RPM

b=13128
i=adilger,shadow

Minor cleanups in lfs find and lfs getstripe

Solaris package prototype
Readme for uoss
Author message for udmu

Ensure Module.symvers is always updated when ldiskfs.o is rebuilt.

Patch by Nathan.

b=12842
i=scjody
i=brian

i=Brian
i=Adilger

att. 11642: more acc-sm fixes.

i=Brian
i=Nathan
i=Tianzy
i=Wangdi

grant check Wangdi patch; elimination of duplicated code.

i=adilger, johann

Quiet redefinition warning.

b=13125
i=nathan, deen

Description: osts not allocated evenly to files
Details    : change the condition to increase offset_idx

Fix for TOE Kernel panic by ksocklnd
b=13246
i=eeb

Fix ofed supporting dates

b=12743
i=deen, adilger

conf-sanity test case for bug 12743: df report consistency on OSTs with different block size.

Test 74 is now 74b and listed in ALWAYS_EXCEPT. Test 74a is based on the old
test but passes on patchless clients.

b=13310
i=adilger
i=green

i=Adilger

Increase checkstat verbosity.

i=Adilger
i=Brian

cleanup_test102() fix

i=Nathan

Wait for MDT value to update.

b=13145
i=Brian

Run conf param on MGS.

when mds and osts use different quota unit(32bit and 64bit), quota will be released
repeatly. This patch voids sending multiple quota reqs to mds, which will keep the
status between the reqs.
b=12588
i=johann
i=wangdi

r=kalpak, johann
description:block bitmap validation patch for RHEL5

r=kalpak, johann