| 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
| ||
|
Message-ID: <2178768.MnKF3D4aeP@wuerfel>
Date: Wed, 27 Jul 2011 00:36:45 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Thomas Gleixner <tglx@...utronix.de>,
Nicolas Pitre <nicolas.pitre@...aro.org>,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Russell King <rmk@....linux.org.uk>
Subject: [GIT PULL] arm-soc cross-platform cleanups for 3.1
Hi Linus,
These are cleanups that unify code across platforms in the arm architecture,
as opposed to the earlier cleanups I sent that clean up code within
each platform. There is a small merge conflict in the
arch/microblaze/include/asm/pci-bridge.h file that should be resolved
by simply removing the enum that was changed in another branch.
Arnd
The following changes since commit ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-07-26 13:38:50 -0700)
are available in the git repository at:
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git/ next/cross-platform
Arnd Bergmann (1):
Merge branch 'cross-platform/clkdev' into next/cross-platform
Kyungmin Park (1):
ARM: Consolidate the clkdev header files
Rob Herring (6):
powerpc: rename ppc_pci_*_flags to pci_*_flags
pci: move microblaze and powerpc pci flag functions into asm-generic
ARM: remove unnecessary mach/hardware.h includes
ARM: pci: make pcibios_assign_all_busses use pci_has_flag
ARM: convert PCI defines to variables
ARM: set vga memory base at run-time
arch/arm/Kconfig | 6 ++
arch/arm/include/asm/clkdev.h | 5 ++
arch/arm/include/asm/pci.h | 12 ++++-
arch/arm/include/asm/vga.h | 5 +-
arch/arm/lib/ecard.S | 1 -
arch/arm/lib/io-readsw-armv3.S | 1 -
arch/arm/lib/io-writesw-armv3.S | 1 -
arch/arm/mach-at91/include/mach/clkdev.h | 7 --
arch/arm/mach-bcmring/include/mach/clkdev.h | 7 --
arch/arm/mach-bcmring/include/mach/hardware.h | 2 -
arch/arm/mach-cns3xxx/cns3420vb.c | 1 -
arch/arm/mach-cns3xxx/include/mach/hardware.h | 22 -------
arch/arm/mach-cns3xxx/pcie.c | 3 +
arch/arm/mach-davinci/include/mach/clkdev.h | 15 -----
arch/arm/mach-dove/include/mach/hardware.h | 7 --
arch/arm/mach-dove/pcie.c | 3 +
arch/arm/mach-ep93xx/include/mach/clkdev.h | 11 ----
arch/arm/mach-ep93xx/include/mach/hardware.h | 2 -
arch/arm/mach-footbridge/dc21285.c | 3 +
arch/arm/mach-footbridge/include/mach/hardware.h | 5 --
arch/arm/mach-integrator/include/mach/hardware.h | 7 --
arch/arm/mach-integrator/pci_v3.c | 5 ++
arch/arm/mach-iop13xx/include/mach/hardware.h | 7 --
arch/arm/mach-iop13xx/pci.c | 5 +-
arch/arm/mach-iop32x/include/mach/hardware.h | 3 -
arch/arm/mach-iop33x/include/mach/hardware.h | 3 -
arch/arm/mach-ixp2000/include/mach/hardware.h | 8 ---
arch/arm/mach-ixp2000/pci.c | 5 ++
arch/arm/mach-ixp23xx/include/mach/hardware.h | 4 -
arch/arm/mach-ixp23xx/pci.c | 5 ++
arch/arm/mach-ixp4xx/common-pci.c | 5 ++
arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 --
arch/arm/mach-kirkwood/include/mach/hardware.h | 7 --
arch/arm/mach-kirkwood/pcie.c | 3 +
arch/arm/mach-ks8695/include/mach/hardware.h | 9 ---
arch/arm/mach-ks8695/pci.c | 3 +
arch/arm/mach-lpc32xx/include/mach/clkdev.h | 25 --------
arch/arm/mach-mmp/include/mach/clkdev.h | 7 --
arch/arm/mach-msm/include/mach/clkdev.h | 19 ------
arch/arm/mach-mv78xx0/include/mach/hardware.h | 7 --
arch/arm/mach-mv78xx0/pcie.c | 3 +
arch/arm/mach-mxs/include/mach/clkdev.h | 7 --
arch/arm/mach-nomadik/include/mach/clkdev.h | 7 --
arch/arm/mach-nuc93x/include/mach/clkdev.h | 7 --
arch/arm/mach-omap1/include/mach/clkdev.h | 5 --
arch/arm/mach-omap2/include/mach/clkdev.h | 5 --
arch/arm/mach-orion5x/include/mach/hardware.h | 7 --
arch/arm/mach-orion5x/pci.c | 2 +
arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 --
arch/arm/mach-pxa/cm-x2xx-pci.c | 3 +
arch/arm/mach-pxa/include/mach/clkdev.h | 7 --
arch/arm/mach-pxa/include/mach/hardware.h | 3 -
arch/arm/mach-sa1100/include/mach/hardware.h | 8 ---
arch/arm/mach-sa1100/pci-nanoengine.c | 3 +
arch/arm/mach-shark/include/mach/hardware.h | 6 --
arch/arm/mach-shark/pci.c | 12 +++-
arch/arm/mach-spear3xx/include/mach/clkdev.h | 19 ------
arch/arm/mach-spear6xx/include/mach/clkdev.h | 19 ------
arch/arm/mach-tegra/include/mach/clkdev.h | 34 -----------
arch/arm/mach-tegra/include/mach/hardware.h | 28 ---------
arch/arm/mach-tegra/include/mach/system.h | 1 -
arch/arm/mach-tegra/io.c | 1 -
arch/arm/mach-tegra/pcie.c | 2 +
arch/arm/mach-tegra/platsmp.c | 1 -
arch/arm/mach-ux500/include/mach/clkdev.h | 7 --
arch/arm/mach-versatile/include/mach/hardware.h | 6 --
arch/arm/mach-versatile/pci.c | 3 +
arch/arm/mach-w90x900/include/mach/clkdev.h | 7 --
arch/arm/mm/iomap.c | 12 ++++
arch/arm/mm/proc-xsc3.S | 1 -
arch/arm/plat-iop/pci.c | 3 +
arch/arm/plat-mxc/include/mach/clkdev.h | 7 --
arch/arm/plat-omap/include/plat/clkdev.h | 13 ----
arch/arm/plat-spear/include/plat/clkdev.h | 20 -------
arch/arm/plat-tcc/include/mach/clkdev.h | 7 --
arch/microblaze/include/asm/pci-bridge.h | 67 +++------------------
arch/powerpc/include/asm/pci-bridge.h | 50 +----------------
arch/powerpc/include/asm/pci.h | 2 +-
arch/powerpc/kernel/pci-common.c | 22 ++++----
arch/powerpc/kernel/pci_32.c | 2 +-
arch/powerpc/kernel/pci_64.c | 4 +-
arch/powerpc/kernel/rtas_pci.c | 2 +-
arch/powerpc/platforms/40x/ep405.c | 2 +-
arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +-
arch/powerpc/platforms/40x/walnut.c | 2 +-
arch/powerpc/platforms/44x/canyonlands.c | 2 +-
arch/powerpc/platforms/44x/ebony.c | 2 +-
arch/powerpc/platforms/44x/ppc44x_simple.c | 2 +-
arch/powerpc/platforms/44x/sam440ep.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
arch/powerpc/platforms/82xx/pq2.c | 2 +-
arch/powerpc/platforms/chrp/pci.c | 2 +-
arch/powerpc/platforms/powermac/pci.c | 6 +-
arch/powerpc/sysdev/fsl_pci.c | 4 +-
arch/powerpc/sysdev/grackle.c | 2 +-
arch/powerpc/sysdev/ppc4xx_pci.c | 2 +-
drivers/clk/Kconfig | 3 +
include/asm-generic/pci-bridge.h | 62 ++++++++++++++++++++
98 files changed, 212 insertions(+), 580 deletions(-)
delete mode 100644 arch/arm/mach-at91/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-cns3xxx/include/mach/hardware.h
delete mode 100644 arch/arm/mach-davinci/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-lpc32xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-mmp/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-msm/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-mxs/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-nuc93x/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-omap1/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-omap2/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-spear3xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-spear6xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-tegra/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-tegra/include/mach/hardware.h
delete mode 100644 arch/arm/mach-ux500/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/clkdev.h
delete mode 100644 arch/arm/plat-mxc/include/mach/clkdev.h
delete mode 100644 arch/arm/plat-omap/include/plat/clkdev.h
delete mode 100644 arch/arm/plat-spear/include/plat/clkdev.h
delete mode 100644 arch/arm/plat-tcc/include/mach/clkdev.h
create mode 100644 include/asm-generic/pci-bridge.h
--
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/
Powered by blists - more mailing lists