Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
diff --git a/arch/microblaze/include/asm/posix_types.h b/arch/microblaze/include/asm/posix_types.h
index 38dc5aa..ccc6235 100644
--- a/arch/microblaze/include/asm/posix_types.h
+++ b/arch/microblaze/include/asm/posix_types.h
@@ -27,7 +27,11 @@
typedef unsigned short __kernel_ipc_pid_t;
typedef unsigned int __kernel_uid_t;
typedef unsigned int __kernel_gid_t;
+#ifdef __GNUC__
+typedef __SIZE_TYPE__ __kernel_size_t;
+#else
typedef unsigned int __kernel_size_t;
+#endif
typedef int __kernel_ssize_t;
typedef int __kernel_ptrdiff_t;
typedef long __kernel_time_t;
diff --git a/include/systemace.h b/include/systemace.h
index 73affc4..3f342d5 100644
--- a/include/systemace.h
+++ b/include/systemace.h
@@ -6,7 +6,6 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-#ident "$Id:$"
#ifdef CONFIG_SYSTEMACE