This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "XFS development tree". The branch, master has been updated 9e4c109 xfs: add AIL pushing tracepoints 2900b33 xfs: put in missed fix for merge problem from 9508534c5f170ada5a745cde0df49732718440e9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9e4c109ac822395e0aae650e4e3c9e4903f6602f Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Tue Oct 11 15:14:11 2011 +0000 xfs: add AIL pushing tracepoints Signed-off-by: Christoph Hellwig <hch@xxxxxx> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 2900b33999e2fc8a8edf0dddaafffec4da25ee10 Author: Alex Elder <aelder@xxxxxxx> Date: Tue Oct 18 20:00:14 2011 +0000 xfs: put in missed fix for merge problem I intended to do this as part of fixing part of the conflict with the merge with Linus' tree, but evidently it didn't get included in the commit. Signed-off-by: Alex Elder <aelder@xxxxxxx> Reviewed-by: Christoph Hellwig <hch@xxxxxx> ----------------------------------------------------------------------- Summary of changes: fs/xfs/xfs_trace.h | 37 +++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_trans_ail.c | 10 +++++++++- 2 files changed, 46 insertions(+), 1 deletions(-) hooks/post-receive -- XFS development tree _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs