linux-kernel - Re: [git pull] Please pull powerpc.git merge branch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <18698.61456.146033.158975@cargo.ozlabs.ibm.com>
Date:	Fri, 31 Oct 2008 22:46:24 +1100
From:	Paul Mackerras <paulus@...ba.org>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
CC:	linuxppc-dev@...abs.org, akpm@...ux-foundation.org,
	linux-kernel@...r.kernel.org
Subject: Re: [git pull] Please pull powerpc.git merge branch

Linus,

Since I sent the pull request, I have added one more commit to my
merge branch, which reverts the commit that Mel Gorman identified as
causing NVRAM corruption (plus another commit that depended on it).

So when you do this:

> Please pull from the 'merge' branch of
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

you'll see this commit in addition:

Paul Mackerras (1):
      Revert "powerpc: Sync RPA note in zImage with kernel's RPA note"

I have included the overall diffstat below.

Thanks,
Paul.

 arch/powerpc/boot/addnote.c                      |  175 ++++++----------------
 arch/powerpc/boot/dts/mpc8313erdb.dts            |   39 -----
 arch/powerpc/boot/libfdt/fdt_ro.c                |    9 +
 arch/powerpc/boot/main.c                         |    2 
 arch/powerpc/boot/wrapper                        |    9 -
 arch/powerpc/configs/40x/acadia_defconfig        |   59 +++++--
 arch/powerpc/configs/40x/ep405_defconfig         |   83 +++++++---
 arch/powerpc/configs/40x/hcu4_defconfig          |  125 +++++++++++-----
 arch/powerpc/configs/40x/kilauea_defconfig       |   69 ++++++---
 arch/powerpc/configs/40x/makalu_defconfig        |   69 ++++++---
 arch/powerpc/configs/40x/walnut_defconfig        |   77 +++++++---
 arch/powerpc/configs/44x/arches_defconfig        |   51 ++++--
 arch/powerpc/configs/44x/bamboo_defconfig        |   77 +++++++---
 arch/powerpc/configs/44x/canyonlands_defconfig   |   61 +++++---
 arch/powerpc/configs/44x/ebony_defconfig         |   77 +++++++---
 arch/powerpc/configs/44x/katmai_defconfig        |   77 +++++++---
 arch/powerpc/configs/44x/rainier_defconfig       |   73 ++++++---
 arch/powerpc/configs/44x/sam440ep_defconfig      |  110 ++++++++++----
 arch/powerpc/configs/44x/sequoia_defconfig       |   78 +++++++---
 arch/powerpc/configs/44x/taishan_defconfig       |   77 +++++++---
 arch/powerpc/configs/44x/warp_defconfig          |   82 +++++++---
 arch/powerpc/configs/linkstation_defconfig       |   11 +
 arch/powerpc/configs/ppc40x_defconfig            |  106 +++++++++++--
 arch/powerpc/configs/ppc44x_defconfig            |  125 ++++++++++++----
 arch/powerpc/include/asm/iommu.h                 |   15 +-
 arch/powerpc/include/asm/kdump.h                 |    8 -
 arch/powerpc/include/asm/mpic.h                  |    2 
 arch/powerpc/include/asm/pci.h                   |    2 
 arch/powerpc/kernel/dma-iommu.c                  |   34 ++--
 arch/powerpc/kernel/head_64.S                    |   30 ++--
 arch/powerpc/kernel/ibmebus.c                    |   27 ++-
 arch/powerpc/kernel/iommu.c                      |   25 ++-
 arch/powerpc/kernel/machine_kexec_64.c           |    9 -
 arch/powerpc/kernel/misc_64.S                    |    9 -
 arch/powerpc/kernel/of_device.c                  |    1 
 arch/powerpc/kernel/pci-common.c                 |  110 +++++++-------
 arch/powerpc/kernel/pci_64.c                     |    2 
 arch/powerpc/kernel/prom_init.c                  |   10 +
 arch/powerpc/kernel/setup_64.c                   |    6 -
 arch/powerpc/kernel/signal_32.c                  |   36 ++---
 arch/powerpc/kernel/signal_64.c                  |   33 ++--
 arch/powerpc/kernel/vio.c                        |   25 ++-
 arch/powerpc/kernel/vmlinux.lds.S                |    5 -
 arch/powerpc/oprofile/op_model_cell.c            |   13 +-
 arch/powerpc/platforms/40x/Kconfig               |    2 
 arch/powerpc/platforms/85xx/mpc85xx_ds.c         |    3 
 arch/powerpc/platforms/86xx/pic.c                |    3 
 arch/powerpc/platforms/cell/iommu.c              |   37 ++---
 arch/powerpc/platforms/cell/ras.c                |    6 -
 arch/powerpc/platforms/embedded6xx/linkstation.c |   14 ++
 arch/powerpc/platforms/iseries/iommu.c           |    7 +
 arch/powerpc/platforms/ps3/system-bus.c          |   36 ++---
 arch/powerpc/platforms/pseries/iommu.c           |    4 -
 arch/powerpc/platforms/pseries/pci_dlpar.c       |    2 
 arch/powerpc/sysdev/mpic.c                       |   59 +++++++
 arch/powerpc/xmon/xmon.c                         |    2 
 drivers/of/device.c                              |   11 +
 57 files changed, 1444 insertions(+), 865 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/