Merge branch 'x86/urgent' into x86/cache
authorThomas Gleixner <tglx@linutronix.de>
Tue, 25 Jun 2019 07:24:35 +0000 (09:24 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 25 Jun 2019 07:24:35 +0000 (09:24 +0200)
Pick up pending upstream fixes to meet dependencies

1  2 
arch/x86/kernel/cpu/resctrl/monitor.c
arch/x86/kernel/cpu/resctrl/rdtgroup.c

Simple merge