summaryrefslogtreecommitdiff
path: root/include/linux/quota.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-07-31 12:58:05 +0300
committerIngo Molnar <mingo@kernel.org>2020-07-31 13:16:09 +0300
commit28cff52eaeb5c43144d0c730080aff0d6bc1e5d5 (patch)
treea55a41b99503a5c96314908b9f30db37e301d64d /include/linux/quota.h
parent92c209ac6d3d35783c16c8a717547183e6e11162 (diff)
parentd8b9faec54ae4bc2fff68bcd0befa93ace8256ce (diff)
downloadlinux-28cff52eaeb5c43144d0c730080aff0d6bc1e5d5.tar.xz
Merge branch 'linus' into locking/core, to resolve conflict
Conflicts: arch/arm/include/asm/percpu.h As Stephen Rothwell noted, there's a conflict between this commit in locking/core: a21ee6055c30 ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables") and this fresh upstream commit: aa54ea903abb ("ARM: percpu.h: fix build error") a21ee6055c30 is a simpler solution to the dependency problem and doesn't further increase header hell - so this conflict resolution effectively reverts aa54ea903abb and uses the a21ee6055c30 solution. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/quota.h')
0 files changed, 0 insertions, 0 deletions