[Lucid-ec2] SRU: Sync upstream changes from 2.6.32.35.15

John Johansen john.johansen at canonical.com
Wed May 4 13:29:54 UTC 2011


On 05/03/2011 02:15 AM, Stefan Bader wrote:
> Except one (which only adds the deviations file and has no impact at
> all), all of these patches are changes to files which the Xen patchset
> has been creating clones. So upstream changes take no effect in the
> ec2 kernel otherwise.
> 
> There is one more patch which we carry (and has been verified to fix
> migration issues) that needs backporting:
> 
> * xen: events: do not unmask event channels on resume
> 
> I have that patch prepared, but as it likely depends on the other
> changes around interrupt handling and delivery, I would put this
> one into the big update that is pending.
> 
> Tested a kernel based on _all_ patches (big patchset and these) running
> the regression tests on a local test system with no issues.
> 
> -Stefan
> 
> The following changes since commit a2954ed27c57dfcc6cdcc1be012364322294df30:
>   Stefan Bader (1):
>         UBUNTU: Start new release
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/smb/ubuntu-lucid.git ec2
> 
> Stefan Bader (5):
>       UBUNTU: XEN: Add deviations file for the EC2 topic branch
>       UBUNTU: XEN: x86: Flush TLB if PGD entry is changed in i386 PAE mode
>       UBUNTU: XEN: x86: Emit "mem=nopentium ignored" warning when not supported
>       UBUNTU: XEN: x86: Fix panic when handling "mem={invalid}" param
>       UBUNTU: XEN: x86/mm: Handle mm_fault_error() in kernel space
> 
>  arch/x86/include/mach-xen/asm/pgtable-3level.h |   11 +--
>  arch/x86/kernel/e820-xen.c                     |   11 ++-
>  arch/x86/mm/fault-xen.c                        |    7 ++
>  arch/x86/mm/pgtable-xen.c                      |    3 +-
>  debian.ec2/deviations.txt                      |   98 ++++++++++++++++++++++++
>  5 files changed, 118 insertions(+), 12 deletions(-)
>  create mode 100644 debian.ec2/deviations.txt
> 

Looks good Stefan, and thanks for the deviations file

Acked-by: John Johansen <john.johansen at canonical.com>




More information about the kernel-team mailing list