b=<12415>
r=<adilger,green>

. Show_error command
. warning if server group has userland test nodes
. lst depends on LND_LIBS

Fix check for s->history allocation NULL return.
b=11039
i=alex

Add sample .quiltrc to have options that reduce CVS patch update differences.
b=12415

-   check against LNET_PID_ANY in libcfs_id2str.
-   clear all lazy portals before lnet_clear_peer_table.

-   collect session-specific ping error counter.
-   set brw_inject_errors and session_timeout via environment variables
    when in userland.
-   removed tsu_error and renamed tsi_stop_onerr as tsi_stoptsu_onerr.

i=kalpak
i=johann

 - bug in quota handling fixed (found with sanity-quota.sh)

* fix ldiskfs module path
* add uml debug file paths

-   reset crpc_bulk.bk_pages should happen after brw_check_bulk is done.

b=12573
i=scjody
Include external headers before $LINUX/include

Module.symvers shipped with kernel distribution.
add check for truncate_complete_page used by patchless client.

b=12415
i=adilger
i=scjody

b=12678
i=adilger
i=scjody

Severity   : enhancement
Bugzilla   : 12678
Description: remove fs_prep_san_write operation and related patches
Details    : remove the ext3-san-jdike patches which are no longer useful.

b=11324
i=adilger
i=alex

Severity   : normal
Frequency  : rare
Bugzilla   : 11324
Description: LDISKFS-fs error (device sdc): ldiskfs_free_blocks
Details    : a disk corruption can cause the mballoc code to assert on a
	     double free.

b=12747
i=wangdi
i=scjody

removed. In this case we need drop using os depended interface to
kmem_cache and use cfs_mem_cache API.

b=12764
i=green
i=wangdi

linux/autoconf.h in commpiler command line.

b=12605
i=wangdi
i=scjody

b=11686
i=green, adilger

improve some error messages.

b=12348
i=adilger
i=mjmac

fix build errors seen when compiling on cray xt3 systems

i=adilger
i=scjody

* Include llog_test.ko in lustre-tests RPM
* Include liblustre tests, when present, in lustre-tests RPM

-   fixed a typo.

b=11680
i=wangdi
i=shadow

Description: make panic on lbug configurable

LCONSOLE_ERROR(fmt, arg) to LCONSOLE_ERROR_MSG(0x000, fmt, ## arg).

b=10595
i=adilger

update from b1_6

Fix build after autoMakefile.toplevel.am rename

b=12068

Rename autoMakefile.toplevel.am back to autoMakefile.am.toplevel to fix
other branches (the top level lustre module is shared between most
branches, unfortunately.)

b=12068

It also includes code fixes for first five improved error messages.

b=10595
i=adilger
i=braam

Move to new ldiskfs series, formerly known as ldiskfs2.

b=12068

Add --disable-modules to fix LTS build failure.

b=12068