Refresh linux-symbol-collisions

.topdeps

@@ -1,3 +1 @@
-gcc-branch
-fix-branch
-feature-branch
+zfs-branch

.topmsg

@@ -1,19 +1,6 @@
 From: Brian Behlendorf <behlendorf1@llnl.gov>
-Subject: [PATCH] zfs branch
+Subject: [PATCH] linux symbol collisions
 
-Merged result of all changes which are relevant to both Solaris
-and Linux builds of the ZFS code.  These are changes where there
-is a reasonable chance they will be accepted upstream.
-
-Additionally, since this is effectively the root of the linux
-ZFS tree the core linux build system is added here.  This
-includes autogen.sh, configure.ac, m4 macros, some scripts/*,
-and makefiles for all the core ZFS components.  Linux-only
-features which require tweaks to the build system should appear
-on the relevant topic branches.  All autotools products which
-result from autogen.sh are commited to the linux-configure-branch.
-
-This branch also contains the META, ChangeLog, AUTHORS,
-README, and GIT files.
+Resolve Linux symbol collisions
 
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

zfs/lib/libzpool/include/sys/dmu_impl.h

@@ -234,8 +234,11 @@ struct dmu_pool;
 
 #define DMU_CALLBACK_MAGIC 0xca11bac0ca11bacfull
 
+/* container_of() already defined in linux kernel */
+#ifndef container_of
 #define container_of(ptr, type, member) \
     ((type *)((char *)(ptr) - offsetof(type, member)))
+#endif
 
 typedef struct dmu_callback {
 	list_node_t         dcb_node;    /* linked to tx_callbacks list */