| Message ID | 1297437370-27650-1-git-send-email-stefan.bader@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 02/11/2011 08:16 AM, Stefan Bader wrote: > SRU justification: > > Impact: The EC2 topic branch carries the xen patchset which created clones > of architectural files that are renamed. The upstream stable patches will > only modify the original files, leaving the xen clones in an inconsistent > state. And unfortunately this is not easily detectable on the rebase. > > Fix: Checked all stable updates and imported the changes made for them to > xen clones in the SUSE patchset (which is the base for the topic branch). > > Testcase: N/A (boot tested on EC2) > > --- > > The following changes since commit 87bf5ec866c59c7c41604fe8f800989a7a81c4d0: > Brad Figg (1): > UBUNTU: Ubuntu-2.6.32-313.26 > > are available in the git repository at: > > git://kernel.ubuntu.com/smb/ubuntu-lucid.git ec2test > This is a tough set of patches to evaluate. However, they all appear to do what is described, and their provenance looks good, so I guess we're just gonna have to do some thorough testing in each EC2 zone. Acked-by: Tim Gardner <tim.gardner@canonical.com> rtg
On 02/11/2011 07:16 AM, Stefan Bader wrote: > SRU justification: > > Impact: The EC2 topic branch carries the xen patchset which created clones > of architectural files that are renamed. The upstream stable patches will > only modify the original files, leaving the xen clones in an inconsistent > state. And unfortunately this is not easily detectable on the rebase. > > Fix: Checked all stable updates and imported the changes made for them to > xen clones in the SUSE patchset (which is the base for the topic branch). > > Testcase: N/A (boot tested on EC2) > > --- > > The following changes since commit 87bf5ec866c59c7c41604fe8f800989a7a81c4d0: > Brad Figg (1): > UBUNTU: Ubuntu-2.6.32-313.26 > > are available in the git repository at: > > git://kernel.ubuntu.com/smb/ubuntu-lucid.git ec2test > They look good to me, and thanks for pulling the changes out this way it made it a lot easier to go through. Acked-by: John Johansen <john.johansen@canonical.com> > Stefan Bader (51): > UBUNTU: SAUCE: XEN: Import f9dee15f07cc3e6625734f3cf667054a5ff5ac2b > UBUNTU: SAUCE: XEN: Import 65d64895d4ed4250448ac6906de25777470b5180 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.7-8 > UBUNTU: SAUCE: XEN: Import cf383fb0c59287a81d6e71ebb7fafffd104a3983 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.8-9 > UBUNTU: SAUCE: XEN: Import ffd91af58e011821332cc56019d1709f7d9a8a54 > UBUNTU: SAUCE: XEN: Import 97a21d3ae6477ef00e39f21e47ce767a8ca1a22a > UBUNTU: SAUCE: XEN: Import b5d6492343e5897eba863ed1d08ca51552657d1f > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.9-10 > UBUNTU: SAUCE: XEN: Import 9fb860778805809529f4c27b896370f2a945e945 > UBUNTU: SAUCE: XEN: Import 20af80bf13116eb2d0d4bd6a307a4260cd277095 > UBUNTU: SAUCE: XEN: Import 481710c9b5d154e81d388e9460fa2851a4ea7c94 > UBUNTU: SAUCE: XEN: Import 9512754e274895426d5305d09a4c667d8621f420 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.10-11 > UBUNTU: SAUCE: XEN: Update import 2444b629ee518745f54c2f7cf9e4de3d48e834cb > UBUNTU: SAUCE: XEN: Import 28995d0c0ef1958ecffdcc80091c46233daea29a > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.11-12 > UBUNTU: SAUCE: XEN: Import fc04955bae3662eecaa8216694fd82b36256cfc6 > UBUNTU: SAUCE: XEN: Import 4bbd3ea6754dc11fdb96a8ab9dfa13e24b1a6599 > UBUNTU: SAUCE: XEN: Import 5a6ca212d5400dfcd8734da1f282b83a01a04d9e > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.12-13 > UBUNTU: SAUCE: XEN: Import cde0c191416d1470a2aa30d893f7ea987363386b > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.13-14 > UBUNTU: SAUCE: XEN: Import fe304738902627ec07c5195664ddb7a6f7750272 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.15-16 > UBUNTU: Xen: Document review of xen3-patch-2.6.32.1-4 > UBUNTU: SAUCE: XEN: Import 941f392437b3005d2d220a7254d48fbc342b6829 > UBUNTU: SAUCE: XEN: Import 7ad50ac196fde9cf57a55b5908764227d9d7f8e6 > UBUNTU: SAUCE: XEN: Import eeb31bcc98f8497dc83c5e7c8ef5c9a9438cb689 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.16-17 > UBUNTU: SAUCE: XEN: Import d5324680becdc93bd37cbbc9581c727959c57ad9 > UBUNTU: SAUCE: XEN: Import f2bb11b1573330fca6ddba33a5cff3695d1a690c > UBUNTU: SAUCE: XEN: Import 7e3ff59bf997c554ebd14b17b9ba4246448e80c7 > UBUNTU: SAUCE: XEN: Import c19aaf77a85ba61de84de2bf6922e269d78223a0 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.18-19 > UBUNTU: SAUCE: XEN: Import 77b49ffdcd22f66180778085716512d508ab2617 > UBUNTU: SAUCE: XEN: Import 34ebf644aafc699db42a5c2d109b6f057ee6b4f3 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.20-21 > UBUNTU: SAUCE: XEN: Import c4dad435c692830c634ab7001b62b6a90b5ae530 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.21-22 > UBUNTU: SAUCE: XEN: Import 52c82b295371158c61f8b06d7a03daaaeedfea00 > UBUNTU: SAUCE: XEN: Import f3a8bea7094f487ed6139a6b6254d0e4147a866d > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.24-25 > UBUNTU: SAUCE: XEN: Import 2e911f0f7f1590fc8c4cb2a331ac1c1799a8385b > UBUNTU: SAUCE: XEN: Import 7aa0c2220a675805f38b43313228544a0cce7488 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.25-26 > UBUNTU: SAUCE: XEN: Import a805c0009da4770f72dab3f3c71cd263f79894aa > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.26-27 > UBUNTU: SAUCE: XEN: Import 26ab8408157fbbc669e1aab1f271bb3cb1c433d0 > UBUNTU: SAUCE: XEN: Import ca51d9445c9b51d6b1c800c9c04e5472d55f0845 > UBUNTU: Xen: Document sync with xen3-patch-2.6.32.27-28 > > arch/x86/Kconfig | 2 +- > arch/x86/include/mach-xen/asm/fixmap.h | 6 +- > arch/x86/include/mach-xen/asm/io.h | 1 + > arch/x86/include/mach-xen/asm/pgalloc.h | 5 + > arch/x86/include/mach-xen/asm/processor.h | 25 -- > arch/x86/include/mach-xen/asm/smp.h | 25 ++- > arch/x86/include/mach-xen/asm/system.h | 2 +- > arch/x86/kernel/acpi/processor_extcntl_xen.c | 2 +- > arch/x86/kernel/apic/io_apic-xen.c | 116 ++++++--- > arch/x86/kernel/cpu/common-xen.c | 2 +- > arch/x86/kernel/cpu/intel.c | 3 + > arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- > arch/x86/kernel/mpparse-xen.c | 7 - > arch/x86/kernel/process-xen.c | 34 ++- > arch/x86/kernel/process_64-xen.c | 6 +- > arch/x86/kernel/quirks-xen.c | 22 ++- > arch/x86/kernel/setup-xen.c | 25 ++- > arch/x86/kernel/smp-xen.c | 13 +- > arch/x86/lib/Makefile | 1 + > arch/x86/lib/cache-smp.c | 8 + > arch/x86/mm/fault-xen.c | 4 +- > arch/x86/mm/init_64-xen.c | 18 ++ > arch/x86/mm/pgtable-xen.c | 31 ++- > arch/x86/pci/irq-xen.c | 2 + > debian.ec2/patches.xen/series.conf | 18 ++ > debian.ec2/patches.xen/xen3-patch-2.6.32.1-2 | 16 +- > debian.ec2/patches.xen/xen3-patch-2.6.32.10-11 | 115 +++++++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.11-12 | 110 ++++++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.12-13 | 47 ++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.13-14 | 29 +++ > debian.ec2/patches.xen/xen3-patch-2.6.32.15-16 | 28 ++ > debian.ec2/patches.xen/xen3-patch-2.6.32.16-17 | 133 ++++++++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.18-19 | 316 ++++++++++++++++++++++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.2-3 | 5 +- > debian.ec2/patches.xen/xen3-patch-2.6.32.20-21 | 30 +++ > debian.ec2/patches.xen/xen3-patch-2.6.32.21-22 | 106 ++++++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.24-25 | 59 +++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.25-26 | 92 +++++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.26-27 | 32 +++ > debian.ec2/patches.xen/xen3-patch-2.6.32.27-28 | 51 ++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.3-4 | 46 ++++- > debian.ec2/patches.xen/xen3-patch-2.6.32.7-8 | 104 ++++++++ > debian.ec2/patches.xen/xen3-patch-2.6.32.8-9 | 18 ++ > debian.ec2/patches.xen/xen3-patch-2.6.32.9-10 | 175 +++++++++++++ > drivers/xen/netfront/netfront.c | 98 ++------ > include/xen/interface/xen.h | 5 + > 46 files changed, 1804 insertions(+), 193 deletions(-) > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.10-11 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.11-12 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.12-13 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.13-14 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.15-16 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.16-17 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.18-19 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.20-21 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.21-22 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.24-25 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.25-26 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.26-27 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.27-28 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.7-8 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.8-9 > create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.9-10 >
Applied and pushed to Lucid-ec2 (opened a new release)
SRU justification: Impact: The EC2 topic branch carries the xen patchset which created clones of architectural files that are renamed. The upstream stable patches will only modify the original files, leaving the xen clones in an inconsistent state. And unfortunately this is not easily detectable on the rebase. Fix: Checked all stable updates and imported the changes made for them to xen clones in the SUSE patchset (which is the base for the topic branch). Testcase: N/A (boot tested on EC2) --- The following changes since commit 87bf5ec866c59c7c41604fe8f800989a7a81c4d0: Brad Figg (1): UBUNTU: Ubuntu-2.6.32-313.26 are available in the git repository at: git://kernel.ubuntu.com/smb/ubuntu-lucid.git ec2test Stefan Bader (51): UBUNTU: SAUCE: XEN: Import f9dee15f07cc3e6625734f3cf667054a5ff5ac2b UBUNTU: SAUCE: XEN: Import 65d64895d4ed4250448ac6906de25777470b5180 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.7-8 UBUNTU: SAUCE: XEN: Import cf383fb0c59287a81d6e71ebb7fafffd104a3983 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.8-9 UBUNTU: SAUCE: XEN: Import ffd91af58e011821332cc56019d1709f7d9a8a54 UBUNTU: SAUCE: XEN: Import 97a21d3ae6477ef00e39f21e47ce767a8ca1a22a UBUNTU: SAUCE: XEN: Import b5d6492343e5897eba863ed1d08ca51552657d1f UBUNTU: Xen: Document sync with xen3-patch-2.6.32.9-10 UBUNTU: SAUCE: XEN: Import 9fb860778805809529f4c27b896370f2a945e945 UBUNTU: SAUCE: XEN: Import 20af80bf13116eb2d0d4bd6a307a4260cd277095 UBUNTU: SAUCE: XEN: Import 481710c9b5d154e81d388e9460fa2851a4ea7c94 UBUNTU: SAUCE: XEN: Import 9512754e274895426d5305d09a4c667d8621f420 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.10-11 UBUNTU: SAUCE: XEN: Update import 2444b629ee518745f54c2f7cf9e4de3d48e834cb UBUNTU: SAUCE: XEN: Import 28995d0c0ef1958ecffdcc80091c46233daea29a UBUNTU: Xen: Document sync with xen3-patch-2.6.32.11-12 UBUNTU: SAUCE: XEN: Import fc04955bae3662eecaa8216694fd82b36256cfc6 UBUNTU: SAUCE: XEN: Import 4bbd3ea6754dc11fdb96a8ab9dfa13e24b1a6599 UBUNTU: SAUCE: XEN: Import 5a6ca212d5400dfcd8734da1f282b83a01a04d9e UBUNTU: Xen: Document sync with xen3-patch-2.6.32.12-13 UBUNTU: SAUCE: XEN: Import cde0c191416d1470a2aa30d893f7ea987363386b UBUNTU: Xen: Document sync with xen3-patch-2.6.32.13-14 UBUNTU: SAUCE: XEN: Import fe304738902627ec07c5195664ddb7a6f7750272 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.15-16 UBUNTU: Xen: Document review of xen3-patch-2.6.32.1-4 UBUNTU: SAUCE: XEN: Import 941f392437b3005d2d220a7254d48fbc342b6829 UBUNTU: SAUCE: XEN: Import 7ad50ac196fde9cf57a55b5908764227d9d7f8e6 UBUNTU: SAUCE: XEN: Import eeb31bcc98f8497dc83c5e7c8ef5c9a9438cb689 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.16-17 UBUNTU: SAUCE: XEN: Import d5324680becdc93bd37cbbc9581c727959c57ad9 UBUNTU: SAUCE: XEN: Import f2bb11b1573330fca6ddba33a5cff3695d1a690c UBUNTU: SAUCE: XEN: Import 7e3ff59bf997c554ebd14b17b9ba4246448e80c7 UBUNTU: SAUCE: XEN: Import c19aaf77a85ba61de84de2bf6922e269d78223a0 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.18-19 UBUNTU: SAUCE: XEN: Import 77b49ffdcd22f66180778085716512d508ab2617 UBUNTU: SAUCE: XEN: Import 34ebf644aafc699db42a5c2d109b6f057ee6b4f3 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.20-21 UBUNTU: SAUCE: XEN: Import c4dad435c692830c634ab7001b62b6a90b5ae530 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.21-22 UBUNTU: SAUCE: XEN: Import 52c82b295371158c61f8b06d7a03daaaeedfea00 UBUNTU: SAUCE: XEN: Import f3a8bea7094f487ed6139a6b6254d0e4147a866d UBUNTU: Xen: Document sync with xen3-patch-2.6.32.24-25 UBUNTU: SAUCE: XEN: Import 2e911f0f7f1590fc8c4cb2a331ac1c1799a8385b UBUNTU: SAUCE: XEN: Import 7aa0c2220a675805f38b43313228544a0cce7488 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.25-26 UBUNTU: SAUCE: XEN: Import a805c0009da4770f72dab3f3c71cd263f79894aa UBUNTU: Xen: Document sync with xen3-patch-2.6.32.26-27 UBUNTU: SAUCE: XEN: Import 26ab8408157fbbc669e1aab1f271bb3cb1c433d0 UBUNTU: SAUCE: XEN: Import ca51d9445c9b51d6b1c800c9c04e5472d55f0845 UBUNTU: Xen: Document sync with xen3-patch-2.6.32.27-28 arch/x86/Kconfig | 2 +- arch/x86/include/mach-xen/asm/fixmap.h | 6 +- arch/x86/include/mach-xen/asm/io.h | 1 + arch/x86/include/mach-xen/asm/pgalloc.h | 5 + arch/x86/include/mach-xen/asm/processor.h | 25 -- arch/x86/include/mach-xen/asm/smp.h | 25 ++- arch/x86/include/mach-xen/asm/system.h | 2 +- arch/x86/kernel/acpi/processor_extcntl_xen.c | 2 +- arch/x86/kernel/apic/io_apic-xen.c | 116 ++++++--- arch/x86/kernel/cpu/common-xen.c | 2 +- arch/x86/kernel/cpu/intel.c | 3 + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- arch/x86/kernel/mpparse-xen.c | 7 - arch/x86/kernel/process-xen.c | 34 ++- arch/x86/kernel/process_64-xen.c | 6 +- arch/x86/kernel/quirks-xen.c | 22 ++- arch/x86/kernel/setup-xen.c | 25 ++- arch/x86/kernel/smp-xen.c | 13 +- arch/x86/lib/Makefile | 1 + arch/x86/lib/cache-smp.c | 8 + arch/x86/mm/fault-xen.c | 4 +- arch/x86/mm/init_64-xen.c | 18 ++ arch/x86/mm/pgtable-xen.c | 31 ++- arch/x86/pci/irq-xen.c | 2 + debian.ec2/patches.xen/series.conf | 18 ++ debian.ec2/patches.xen/xen3-patch-2.6.32.1-2 | 16 +- debian.ec2/patches.xen/xen3-patch-2.6.32.10-11 | 115 +++++++++ debian.ec2/patches.xen/xen3-patch-2.6.32.11-12 | 110 ++++++++ debian.ec2/patches.xen/xen3-patch-2.6.32.12-13 | 47 ++++ debian.ec2/patches.xen/xen3-patch-2.6.32.13-14 | 29 +++ debian.ec2/patches.xen/xen3-patch-2.6.32.15-16 | 28 ++ debian.ec2/patches.xen/xen3-patch-2.6.32.16-17 | 133 ++++++++++ debian.ec2/patches.xen/xen3-patch-2.6.32.18-19 | 316 ++++++++++++++++++++++++ debian.ec2/patches.xen/xen3-patch-2.6.32.2-3 | 5 +- debian.ec2/patches.xen/xen3-patch-2.6.32.20-21 | 30 +++ debian.ec2/patches.xen/xen3-patch-2.6.32.21-22 | 106 ++++++++ debian.ec2/patches.xen/xen3-patch-2.6.32.24-25 | 59 +++++ debian.ec2/patches.xen/xen3-patch-2.6.32.25-26 | 92 +++++++ debian.ec2/patches.xen/xen3-patch-2.6.32.26-27 | 32 +++ debian.ec2/patches.xen/xen3-patch-2.6.32.27-28 | 51 ++++ debian.ec2/patches.xen/xen3-patch-2.6.32.3-4 | 46 ++++- debian.ec2/patches.xen/xen3-patch-2.6.32.7-8 | 104 ++++++++ debian.ec2/patches.xen/xen3-patch-2.6.32.8-9 | 18 ++ debian.ec2/patches.xen/xen3-patch-2.6.32.9-10 | 175 +++++++++++++ drivers/xen/netfront/netfront.c | 98 ++------ include/xen/interface/xen.h | 5 + 46 files changed, 1804 insertions(+), 193 deletions(-) create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.10-11 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.11-12 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.12-13 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.13-14 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.15-16 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.16-17 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.18-19 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.20-21 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.21-22 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.24-25 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.25-26 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.26-27 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.27-28 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.7-8 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.8-9 create mode 100644 debian.ec2/patches.xen/xen3-patch-2.6.32.9-10