Hi all,
I have included the conflict diff below. I fixed up the merge by
removing fs/xfs/Makefile-linux-2.6 and using the be32_add_cpu routine
(rather than be32_add).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc fs/xfs/Makefile-linux-2.6
index 9731645,e69de29..0000000
--- a/fs/xfs/Makefile-linux-2.6
+++ b/fs/xfs/Makefile-linux-2.6
@@@ -1,117 -1,0 +1,120 @@@
++<<<<<<< HEAD:fs/xfs/Makefile-linux-2.6
+#
+# Copyright (c) 2000-2005 Silicon Graphics, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+EXTRA_CFLAGS += -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char
+
+XFS_LINUX := linux-2.6
+
+ifeq ($(CONFIG_XFS_DEBUG),y)
+ EXTRA_CFLAGS += -g
+endif
+
+obj-$(CONFIG_XFS_FS) += xfs.o
+
+xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
+ xfs_dquot.o \
+ xfs_dquot_item.o \
+ xfs_trans_dquot.o \
+ xfs_qm_syscalls.o \
+ xfs_qm_bhv.o \
+ xfs_qm.o)
+
+ifeq ($(CONFIG_XFS_QUOTA),y)
+xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
+endif
+
+xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
+xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
+xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o
+xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o
+xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o
+
+
+xfs-y += xfs_alloc.o \
+ xfs_alloc_btree.o \
+ xfs_attr.o \
+ xfs_attr_leaf.o \
+ xfs_bit.o \
+ xfs_bmap.o \
+ xfs_bmap_btree.o \
+ xfs_btree.o \
+ xfs_buf_item.o \
+ xfs_da_btree.o \
+ xfs_dir2.o \
+ xfs_dir2_block.o \
+ xfs_dir2_data.o \
+ xfs_dir2_leaf.o \
+ xfs_dir2_node.o \
+ xfs_dir2_sf.o \
+ xfs_error.o \
+ xfs_extfree_item.o \
+ xfs_filestream.o \
+ xfs_fsops.o \
+ xfs_ialloc.o \
+ xfs_ialloc_btree.o \
+ xfs_iget.o \
+ xfs_inode.o \
+ xfs_inode_item.o \
+ xfs_iomap.o \
+ xfs_itable.o \
+ xfs_dfrag.o \
+ xfs_log.o \
+ xfs_log_recover.o \
+ xfs_mount.o \
+ xfs_mru_cache.o \
+ xfs_rename.o \
+ xfs_trans.o \
+ xfs_trans_ail.o \
+ xfs_trans_buf.o \
+ xfs_trans_extfree.o \
+ xfs_trans_inode.o \
+ xfs_trans_item.o \
+ xfs_utils.o \
+ xfs_vfsops.o \
+ xfs_vnodeops.o \
+ xfs_rw.o \
+ xfs_dmops.o \
+ xfs_qmops.o
+
+xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o
+
+# Objects in linux/
+xfs-y += $(addprefix $(XFS_LINUX)/, \
+ kmem.o \
+ xfs_aops.o \
+ xfs_buf.o \
+ xfs_export.o \
+ xfs_file.o \
+ xfs_fs_subr.o \
+ xfs_globals.o \
+ xfs_ioctl.o \
+ xfs_iops.o \
+ xfs_lrw.o \
+ xfs_super.o \
+ xfs_vnode.o)
+
+# Objects in support/
+xfs-y += $(addprefix support/, \
+ debug.o \
+ uuid.o)
+
+xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o
+
++=======
++>>>>>>> xfs/master:fs/xfs/Makefile-linux-2.6
diff --cc fs/xfs/xfs_log.c
index a75edca,b3ac380..0000000
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@@ -1509,9 -1509,9 +1509,17 @@@ xlog_sync(xlog_t *log
* case, though.
*/
for (i = 0; i < split; i += BBSIZE) {
++<<<<<<< HEAD:fs/xfs/xfs_log.c
+ be32_add_cpu((__be32 *)dptr, 1);
++=======
+ be32_add((__be32 *)dptr, 1);
++>>>>>>> xfs/master:fs/xfs/xfs_log.c
if (be32_to_cpu(*(__be32 *)dptr) ==
XLOG_HEADER_MAGIC_NUM)
++<<<<<<< HEAD:fs/xfs/xfs_log.c
+ be32_add_cpu((__be32 *)dptr, 1);
++=======
+ be32_add((__be32 *)dptr, 1);
++>>>>>>> xfs/master:fs/xfs/xfs_log.c
dptr += BBSIZE;
}
@@@ -1600,7 -1600,7 +1608,11 @@@ xlog_state_finish_copy(xlog_t *log
{
spin_lock(&log->l_icloglock);
++<<<<<<< HEAD:fs/xfs/xfs_log.c
+ be32_add_cpu(&iclog->ic_header.h_num_logops, record_cnt);
++=======
+ be32_add(&iclog->ic_header.h_num_logops, record_cnt);
++>>>>>>> xfs/master:fs/xfs/xfs_log.c
iclog->ic_offset += copy_bytes;
spin_unlock(&log->l_icloglock);
-- Attached file included as plaintext by Ecartis --
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFHtTcQTgG2atn1QN8RAttgAKCQRJI/hQ9vAGEyYMNctKdl+1cdMQCffmP2
ky8JHore/gLxlGRNPfeGz9o=
=GJVS
-----END PGP SIGNATURE-----
|