From bf590656f4bcf3aabc56f78ed7de8dbc55988156 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: May 12 2017 13:36:46 +0000 Subject: Linux v4.11-13318-g09d79d1 --- diff --git a/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch b/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch new file mode 100644 index 0000000..af2a3df --- /dev/null +++ b/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch @@ -0,0 +1,65 @@ +From patchwork Fri May 12 10:04:52 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/ +From: Marc Zyngier +X-Patchwork-Id: 9723825 +Message-Id: <20170512100452.8245-1-marc.zyngier@arm.com> +To: Christoffer Dall +Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, + linux-arm-kernel@lists.infradead.org, arnd@arndb.de +Date: Fri, 12 May 2017 11:04:52 +0100 + +Moving most of the shared code to virt/kvm/arm had for consequence +that KVM/ARM doesn't build anymore, because the code that used to +define the tracepoints is now somewhere else. + +Fix this by defining CREATE_TRACE_POINTS in coproc.c, and clean-up +trace.h as well. + +Fixes: 35d2d5d490e2 ("KVM: arm/arm64: Move shared files to virt/kvm/arm") +Reported-by: Arnd Bergmann +Signed-off-by: Marc Zyngier +--- + arch/arm/kvm/coproc.c | 1 + + arch/arm/kvm/trace.h | 8 ++++---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c +index 2c14b69511e9..ac8d36da4d08 100644 +--- a/arch/arm/kvm/coproc.c ++++ b/arch/arm/kvm/coproc.c +@@ -32,6 +32,7 @@ + #include + #include "../vfp/vfpinstr.h" + ++#define CREATE_TRACE_POINTS + #include "trace.h" + #include "coproc.h" + +diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h +index fc0943776db2..b0d10648c486 100644 +--- a/arch/arm/kvm/trace.h ++++ b/arch/arm/kvm/trace.h +@@ -1,5 +1,5 @@ +-#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +-#define _TRACE_KVM_H ++#if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _TRACE_ARM_KVM_H + + #include + +@@ -74,10 +74,10 @@ TRACE_EVENT(kvm_hvc, + __entry->vcpu_pc, __entry->r0, __entry->imm) + ); + +-#endif /* _TRACE_KVM_H */ ++#endif /* _TRACE_ARM_KVM_H */ + + #undef TRACE_INCLUDE_PATH +-#define TRACE_INCLUDE_PATH arch/arm/kvm ++#define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE + #define TRACE_INCLUDE_FILE trace + diff --git a/baseconfig/CONFIG_USB_PCI b/baseconfig/CONFIG_USB_PCI index 4ffaf0a..26c372a 100644 --- a/baseconfig/CONFIG_USB_PCI +++ b/baseconfig/CONFIG_USB_PCI @@ -1 +1 @@ -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y diff --git a/baseconfig/arm/CONFIG_USB_PCI b/baseconfig/arm/CONFIG_USB_PCI deleted file mode 100644 index 26c372a..0000000 --- a/baseconfig/arm/CONFIG_USB_PCI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_PCI=y diff --git a/gitrev b/gitrev index 0d9d675..1594161 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -791a9a666d1afe2603bcb2c6a4852d684e879252 +09d79d103371b1b7ea70ea7f9c05ac207ef22f5d diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 4429bfb..9a7e6be 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -5556,7 +5556,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 3b2695b..ec5cc3e 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -5578,7 +5578,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index e196d7f..b43dd12 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5578,7 +5578,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-i686.config b/kernel-i686.config index ef68bb3..0793af7 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5556,7 +5556,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index adeda7b..d38c122 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -5373,7 +5373,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index a1d64b6..39db650 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -5349,7 +5349,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 727f58c..a903e23 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5302,7 +5302,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index c539655..baa4dc2 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5278,7 +5278,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 636f746..b315c89 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -5301,7 +5301,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index ba7bfd1..35272d5 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -5277,7 +5277,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 02ef3b7..b49f3a9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5192,7 +5192,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 1a668bf..e58a1f7 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5168,7 +5168,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 0e31cd4..5a4ae32 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5609,7 +5609,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 6bc956d..2d35eae 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5587,7 +5587,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel.spec b/kernel.spec index 4ccc329..c303c84 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 8 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -595,6 +595,8 @@ Patch668: CVE-2017-7477.patch # Fix build on PPC Patch669: powerpc-fix-distclean-with-Makefile.postlink.patch +Patch679: ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch + # END OF PATCH DEFINITIONS %endif @@ -2167,6 +2169,9 @@ fi # # %changelog +* Fri May 12 2017 Justin M. Forbes - 4.12.0-0.rc0.git9.1 +- Linux v4.11-13318-g09d79d1 + * Thu May 11 2017 Justin M. Forbes - 4.12.0-0.rc0.git8.1 - Linux v4.11-13167-g791a9a6 diff --git a/sources b/sources index f689356..fb115ea 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 -SHA512 (patch-4.11-git8.xz) = fd1a247a29f73ebd408cef1c41f923ac5a92062e9dae3e8fdffb964cd96936fac823273455a7c2669ffec0edecd4df6ebb9f379f693dfe8867b900b2c6a187f4 +SHA512 (patch-4.11-git9.xz) = cae51497abd2aa7f5cb1f92b03a469515ceccf14dbd41112f28612b41c04792100fc916c0b2aa5241b83c2c113b133d5a1c39291483abc1be15b82ac1dad7634