History

Merge branch 'akpm' (fixes from Andrew Morton)

Merge patches from Andrew Morton: "22 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits) kexec: purgatory: add clean-up for purgatory directory Documentation/kdump/kdump.txt: add ARM description flush_icache_range: export symbol to fix build errors tools: selftests: fix build issue with make kselftests target ocfs2: quorum: add a log for node not fenced ocfs2: o2net: set tcp user timeout to max value ocfs2: o2net: don't shutdown connection when idle timeout ocfs2: do not write error flag to user structure we cannot copy from/to x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatory drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified xattr: fix check for simultaneous glibc header inclusion kexec: remove CONFIG_KEXEC dependency on crypto kexec: create a new config option CONFIG_KEXEC_FILE for new syscall x86,mm: fix pte_special versus pte_numa hugetlb_cgroup: use lockdep_assert_held rather than spin_is_locked mm/zpool: use prefixed module loading zram: fix incorrect stat with failed_reads lib: turn CONFIG_STACKTRACE into an actual option. mm: actually clear pmd_numa before invalidating memblock, memhotplug: fix wrong type in memblock_find_in_range_node(). ...

Linus Torvalds committed 12 years ago

Commit 10f32912 parents 878e580 b0108f944 files · +238 −177Browse files

Showing the changes to include/uapi/linux (1 of 44 files). Show all

Unified · Split

include/uapi/linux/xattr.h+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
13#ifndef _UAPI_LINUX_XATTR_H13#ifndef _UAPI_LINUX_XATTR_H
14#define _UAPI_LINUX_XATTR_H14#define _UAPI_LINUX_XATTR_H
15 15
16#ifdef __UAPI_DEF_XATTR16#if __UAPI_DEF_XATTR
17#define __USE_KERNEL_XATTR_DEFS17#define __USE_KERNEL_XATTR_DEFS
18 18
19#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */19#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */