linux-stable/include
Ingo Molnar 28cff52eae 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:

  a21ee6055c ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables")

and this fresh upstream commit:

  aa54ea903a ("ARM: percpu.h: fix build error")

a21ee6055c is a simpler solution to the dependency problem and doesn't
further increase header hell - so this conflict resolution effectively
reverts aa54ea903a and uses the a21ee6055c solution.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2020-07-31 12:16:09 +02:00
..
acpi
asm-generic Merge branch 'linus' into locking/core, to resolve conflict 2020-07-31 12:16:09 +02:00
clocksource
crypto crypto: af_alg - fix use-after-free in af_alg_accept() due to bh_lock_sock() 2020-06-18 17:09:54 +10:00
drm * drm: fix possible use-after-free 2020-07-29 12:46:58 +10:00
dt-bindings
keys RxRPC: Replace zero-length array with flexible-array 2020-06-15 23:08:32 -05:00
kunit
kvm
linux Merge branch 'linus' into locking/core, to resolve conflict 2020-07-31 12:16:09 +02:00
math-emu
media media updates for v5.8-rc1 2020-06-13 13:09:38 -07:00
misc
net flow_offload: Move rhashtable inclusion to the source file 2020-07-24 15:17:22 -07:00
pcmcia
ras
rdma
scsi
soc
sound ASoC: Fixes for v5.8 2020-07-17 18:19:02 +02:00
target
trace Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-06-25 18:27:40 -07:00
uapi Char/Misc fixes for 5.8-rc6 2020-07-16 11:26:40 -07:00
vdso
video
xen