[request pull] intrepid-ports - Rebased to 2.6.25.16 and patched for PS3

Tim Gardner tim.gardner at canonical.com
Mon Sep 22 14:07:15 UTC 2008


Dan Munckton wrote:
> The following changes since commit 2929118673064683f61af2f2d1e1f3a455b10a47:
>   Ben Collins (1):
>         UBUNTU: build: Add 386 to d-i build
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/dmunckton/ubuntu-intrepid-ports.git master
> 
> Dan Munckton (10):
>       UBUNTU: Fix getabis script so it fetches the ports packages successfully
>       UBUNTU: Start new release
>       UBUNTU: config: updates for 2.6.25.11 since 2.6.25.4
>       UBUNTU: config: enabled Gelic wireless support for PS3.
>       UBUNTU: config: lowered the PS3 framebuffer size to 9MB
>       UBUNTU: config: enabled support for the PS3 Logical Performance Monitor
>       UBUNTU: SAUCE: PS3/powerpc vmemmap variable page size patch (closes LP: #220524)
>       UBUNTU: SAUCE: applied PS3 system bus quiet match output patch.
>       UBUNTU: Bump ABI
>       UBUNTU: SAUCE: apply usb-fix-hcd-interrupt-disabling.patch to fix boot hang.
> 
>  arch/powerpc/mm/hash_utils_64.c                    |   28 +-
>  arch/powerpc/mm/init_64.c                          |    8 +-
>  arch/powerpc/mm/slb.c                              |   14 +-
>  arch/powerpc/mm/slb_low.S                          |   16 +-
>  arch/powerpc/platforms/ps3/system-bus.c            |   21 +-
>  debian/abi/2.6.25-1.2/abiname                      |    1 +
>  debian/abi/2.6.25-1.2/hppa/hppa32                  | 4948 +++++++++++++
>  debian/abi/2.6.25-1.2/hppa/hppa32.modules          |  733 ++
>  debian/abi/2.6.25-1.2/hppa/hppa64                  | 4619 ++++++++++++
>  debian/abi/2.6.25-1.2/hppa/hppa64.modules          |  579 ++
>  debian/abi/2.6.25-1.2/i386/386                     | 6936 ++++++++++++++++++
>  debian/abi/2.6.25-1.2/i386/386.modules             | 1919 +++++
>  debian/abi/2.6.25-1.2/powerpc/powerpc              | 7079 +++++++++++++++++++
>  debian/abi/2.6.25-1.2/powerpc/powerpc-smp          | 7147 +++++++++++++++++++
>  debian/abi/2.6.25-1.2/powerpc/powerpc-smp.modules  | 1712 +++++
>  debian/abi/2.6.25-1.2/powerpc/powerpc.modules      | 1716 +++++
>  debian/abi/2.6.25-1.2/powerpc/powerpc64-smp        | 7324 ++++++++++++++++++++
>  .../abi/2.6.25-1.2/powerpc/powerpc64-smp.modules   | 1683 +++++
>  debian/abi/2.6.25-1.2/sparc/sparc64                | 6026 ++++++++++++++++
>  debian/abi/2.6.25-1.2/sparc/sparc64-smp            | 6104 ++++++++++++++++
>  debian/abi/2.6.25-1.2/sparc/sparc64-smp.modules    | 1050 +++
>  debian/abi/2.6.25-1.2/sparc/sparc64.modules        | 1051 +++
>  debian/changelog                                   |    8 +
>  debian/config/i386/config                          |    3 +-
>  debian/config/powerpc/config.powerpc64-smp         |    6 +-
>  debian/control                                     |   78 +-
>  debian/control.stub                                |   78 +-
>  debian/d-i/kernel-versions                         |   14 +-
>  debian/scripts/misc/getabis                        |   12 +-
>  drivers/usb/core/hcd.c                             |    3 +-
>  include/asm-powerpc/mmu-hash64.h                   |    1 +
>  include/asm-powerpc/pgtable-ppc64.h                |   10 +-
>  32 files changed, 60811 insertions(+), 116 deletions(-)
>  create mode 100644 debian/abi/2.6.25-1.2/abiname
>  create mode 100644 debian/abi/2.6.25-1.2/hppa/hppa32
>  create mode 100644 debian/abi/2.6.25-1.2/hppa/hppa32.modules
>  create mode 100644 debian/abi/2.6.25-1.2/hppa/hppa64
>  create mode 100644 debian/abi/2.6.25-1.2/hppa/hppa64.modules
>  create mode 100644 debian/abi/2.6.25-1.2/i386/386
>  create mode 100644 debian/abi/2.6.25-1.2/i386/386.modules
>  create mode 100644 debian/abi/2.6.25-1.2/powerpc/powerpc
>  create mode 100644 debian/abi/2.6.25-1.2/powerpc/powerpc-smp
>  create mode 100644 debian/abi/2.6.25-1.2/powerpc/powerpc-smp.modules
>  create mode 100644 debian/abi/2.6.25-1.2/powerpc/powerpc.modules
>  create mode 100644 debian/abi/2.6.25-1.2/powerpc/powerpc64-smp
>  create mode 100644 debian/abi/2.6.25-1.2/powerpc/powerpc64-smp.modules
>  create mode 100644 debian/abi/2.6.25-1.2/sparc/sparc64
>  create mode 100644 debian/abi/2.6.25-1.2/sparc/sparc64-smp
>  create mode 100644 debian/abi/2.6.25-1.2/sparc/sparc64-smp.modules
>  create mode 100644 debian/abi/2.6.25-1.2/sparc/sparc64.modules
> 
> 

I sure get a lot of conflicts on the pull. Did you rebase correctly first ?

-- 
Tim Gardner tim.gardner at canonical.com




More information about the kernel-team mailing list