From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Kumar Gala <galak@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [git pull] Please pull powerpc.git next branch
Date: Thu, 14 Oct 2010 12:02:11 +1100 [thread overview]
Message-ID: <1287018131.2205.50.camel@pasglop> (raw)
In-Reply-To: <Pine.LNX.4.64.1010131706440.4711@localhost.localdomain>
On Wed, 2010-10-13 at 17:08 -0500, Kumar Gala wrote:
> The following changes since commit 4108d9ba9091c55cfb968d42dd7dcae9a098b876:
>
> powerpc/Makefiles: Change to new flag variables (2010-10-13 16:19:22 +1100)
>
> are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git next
Fail :-)
/home/benh/linux-powerpc-test/arch/powerpc/sysdev/fsl_pci.c:494: error: redefinition of 'fsl_pci_immrbar_base'
/home/benh/linux-powerpc-test/arch/powerpc/sysdev/fsl_pci.c:313: note: previous definition of 'fsl_pci_immrbar_base' was here
make[2]: *** [arch/powerpc/sysdev/fsl_pci.o] Error 1
make[2]: *** Waiting for unfinished jobs....
Cheers,
Ben.
> Harninder Rai (1):
> powerpc/fsl: 85xx: add cache-sram support
>
> Ilya Yanok (1):
> powerpc/mpc83xx: Support for MPC8308 P1M board
>
> Kumar Gala (10):
> powerpc/fsl-pci: Fix MSI support on 83xx platforms
> powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
> powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
> powerpc/fsl-booke: Add p3041 DS board support
> powerpc: Fix compile error with paca code on ppc64e
> powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
> powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes
> powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
> powerpc/fsl-booke: Add p5020 DS board support
> powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig
>
> Matthew McClintock (6):
> powerpc/kexec: make masking/disabling interrupts generic
> powerpc/85xx: Remove call to mpic_teardown_this_cpu in kexec
> powerpc/85xx: Minor fixups for kexec on 85xx
> powerpc/85xx: flush dcache before resetting cores
> powerpc/fsl_soc: Search all global-utilities nodes for rstccr
> powerpc/fsl_booke: Add support to boot from core other than 0
>
> Paul Gortmaker (1):
> powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT
>
> Scott Wood (1):
> oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.
>
> Timur Tabi (4):
> powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols
> powerpc/watchdog: Allow the Book-E driver to be compiled as a module
> powerpc/p1022: Add probing for individual DMA channels
> powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board
>
> arch/powerpc/boot/dts/mpc8308_p1m.dts | 332 ++++++++++++++++++++++++
> arch/powerpc/boot/dts/p1022ds.dts | 11 +
> arch/powerpc/configs/e55xx_smp_defconfig | 84 ++++++
> arch/powerpc/configs/ppc64e_defconfig | 4 +-
> arch/powerpc/include/asm/fsl_85xx_cache_sram.h | 48 ++++
> arch/powerpc/include/asm/kexec.h | 1 +
> arch/powerpc/include/asm/mmu-book3e.h | 15 +
> arch/powerpc/include/asm/pte-common.h | 7 +
> arch/powerpc/kernel/Makefile | 4 +-
> arch/powerpc/kernel/asm-offsets.c | 4 +-
> arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 +
> arch/powerpc/kernel/cputable.c | 28 ++-
> arch/powerpc/kernel/crash.c | 13 +-
> arch/powerpc/kernel/head_fsl_booke.S | 10 +-
> arch/powerpc/kernel/machine_kexec.c | 24 ++
> arch/powerpc/kernel/machine_kexec_32.c | 4 +
> arch/powerpc/kernel/paca.c | 2 +-
> arch/powerpc/kernel/setup_32.c | 2 +-
> arch/powerpc/kernel/time.c | 3 +-
> arch/powerpc/kernel/traps.c | 5 +
> arch/powerpc/mm/Makefile | 2 +-
> arch/powerpc/mm/fsl_booke_mmu.c | 15 +-
> arch/powerpc/mm/mmu_decl.h | 5 +-
> arch/powerpc/mm/tlb_nohash.c | 56 ++++-
> arch/powerpc/mm/tlb_nohash_low.S | 2 +-
> arch/powerpc/oprofile/op_model_fsl_emb.c | 15 +-
> arch/powerpc/platforms/83xx/Kconfig | 4 +-
> arch/powerpc/platforms/83xx/mpc830x_rdb.c | 3 +-
> arch/powerpc/platforms/85xx/Kconfig | 28 ++-
> arch/powerpc/platforms/85xx/Makefile | 2 +
> arch/powerpc/platforms/85xx/p1022_ds.c | 2 +
> arch/powerpc/platforms/85xx/p3041_ds.c | 64 +++++
> arch/powerpc/platforms/85xx/p5020_ds.c | 69 +++++
> arch/powerpc/platforms/85xx/smp.c | 76 +++++-
> arch/powerpc/platforms/Kconfig.cputype | 8 +-
> arch/powerpc/sysdev/Makefile | 1 +
> arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 101 +++++++
> arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 159 +++++++++++
> arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 231 ++++++++++++++++
> arch/powerpc/sysdev/fsl_msi.c | 9 +-
> arch/powerpc/sysdev/fsl_pci.c | 51 ++++-
> arch/powerpc/sysdev/fsl_pci.h | 1 +
> arch/powerpc/sysdev/fsl_soc.c | 20 +-
> arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 +
> drivers/watchdog/Kconfig | 5 +-
> drivers/watchdog/booke_wdt.c | 39 +++-
> include/linux/pci_ids.h | 8 +
> 47 files changed, 1516 insertions(+), 79 deletions(-)
> create mode 100644 arch/powerpc/boot/dts/mpc8308_p1m.dts
> create mode 100644 arch/powerpc/configs/e55xx_smp_defconfig
> create mode 100644 arch/powerpc/include/asm/fsl_85xx_cache_sram.h
> create mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c
> create mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c
> create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
> create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_sram.c
> create mode 100644 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
next prev parent reply other threads:[~2010-10-14 1:02 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-13 22:08 [git pull] Please pull powerpc.git next branch Kumar Gala
2010-10-14 1:02 ` Benjamin Herrenschmidt [this message]
2010-10-14 6:19 ` [git pull] Please pull powerpc.git next branch (updated) Kumar Gala
-- strict thread matches above, loose matches on Subject: below --
2014-08-14 6:16 [git pull] Please pull powerpc.git next branch Benjamin Herrenschmidt
2014-08-14 6:18 ` Benjamin Herrenschmidt
2014-08-07 5:08 Benjamin Herrenschmidt
2014-06-13 0:55 Benjamin Herrenschmidt
2014-06-13 0:56 ` Benjamin Herrenschmidt
2014-06-07 4:34 Benjamin Herrenschmidt
2014-04-01 23:34 Benjamin Herrenschmidt
2014-01-30 2:55 Benjamin Herrenschmidt
2014-01-28 4:35 Benjamin Herrenschmidt
2014-01-28 9:16 ` Olaf Hering
2014-01-28 9:16 ` Olaf Hering
2014-01-28 15:03 ` Olaf Hering
2014-01-28 15:03 ` Olaf Hering
2014-01-28 20:19 ` Benjamin Herrenschmidt
2014-01-29 2:29 ` Alistair Popple
2014-01-29 8:41 ` Olaf Hering
2014-01-29 8:41 ` Olaf Hering
2014-02-03 3:00 ` Michael Ellerman
2014-02-03 3:00 ` Michael Ellerman
2013-11-12 0:31 Benjamin Herrenschmidt
2013-09-06 2:24 Benjamin Herrenschmidt
2013-09-06 17:56 ` Linus Torvalds
2013-09-07 7:12 ` Benjamin Herrenschmidt
2013-07-03 22:43 Benjamin Herrenschmidt
2013-05-02 7:35 Benjamin Herrenschmidt
2013-04-29 19:56 Kumar Gala
2013-02-23 17:45 Benjamin Herrenschmidt
2013-02-19 17:18 Kumar Gala
2012-12-14 20:44 Benjamin Herrenschmidt
2012-12-16 22:24 ` Benjamin Herrenschmidt
2012-12-17 8:30 ` Anatolij Gustschin
2012-12-17 10:06 ` Benjamin Herrenschmidt
2012-12-17 10:15 ` Anatolij Gustschin
2012-12-17 23:31 ` Benjamin Herrenschmidt
2012-12-17 23:31 ` Benjamin Herrenschmidt
2012-12-18 18:02 ` Linus Torvalds
2012-12-18 18:02 ` Linus Torvalds
2012-12-19 23:10 ` Benjamin Herrenschmidt
2012-12-19 23:10 ` Benjamin Herrenschmidt
2012-11-25 13:27 Kumar Gala
2012-11-25 22:26 ` Benjamin Herrenschmidt
2012-10-03 13:25 Kumar Gala
2012-09-19 15:08 Kumar Gala
2012-09-13 18:21 Kumar Gala
2012-07-23 4:46 Benjamin Herrenschmidt
2012-07-12 22:00 Kumar Gala
2012-05-23 3:40 Benjamin Herrenschmidt
2012-03-29 20:44 Kumar Gala
2012-03-29 21:47 ` Tabi Timur-B04825
2012-04-02 15:25 ` Tabi Timur-B04825
2012-03-28 3:31 Benjamin Herrenschmidt
2012-03-22 0:46 Benjamin Herrenschmidt
2012-03-22 2:02 ` Linus Torvalds
2012-03-22 2:44 ` Benjamin Herrenschmidt
2012-03-22 2:44 ` Benjamin Herrenschmidt
2012-03-22 3:01 ` Tony Breeds
2012-03-22 3:01 ` Tony Breeds
2012-03-22 4:13 ` Kyle Moffett
2012-03-22 4:13 ` Kyle Moffett
2012-03-22 5:33 ` Benjamin Herrenschmidt
2012-03-22 5:33 ` Benjamin Herrenschmidt
2012-03-16 21:30 Kumar Gala
2012-01-06 3:42 Benjamin Herrenschmidt
2012-01-04 22:06 Kumar Gala
2012-01-08 23:58 ` Michael Neuling
2011-11-24 8:39 Kumar Gala
2011-11-06 23:35 Benjamin Herrenschmidt
2011-11-03 18:27 Kumar Gala
2011-07-26 4:17 Benjamin Herrenschmidt
2011-07-25 14:08 [GIT PULL] " Kumar Gala
2011-07-08 12:58 [git pull] " Kumar Gala
2011-06-23 10:29 Kumar Gala
2011-05-20 3:31 [GIT PULL] " Kumar Gala
2011-05-20 4:38 ` Kumar Gala
2011-03-18 5:44 [git pull] " Benjamin Herrenschmidt
2011-03-18 13:34 ` Linus Torvalds
2011-03-18 21:48 ` Benjamin Herrenschmidt
2011-03-18 23:48 ` Hollis Blanchard
2011-03-15 21:04 Kumar Gala
2011-01-13 0:07 Kumar Gala
2010-10-22 3:51 Benjamin Herrenschmidt
2010-10-22 4:23 ` Linus Torvalds
2010-08-09 4:11 Benjamin Herrenschmidt
2010-08-09 4:39 ` Benjamin Herrenschmidt
2010-08-09 5:18 ` Grant Likely
2010-08-09 5:18 ` Grant Likely
2010-08-09 11:25 ` Benjamin Herrenschmidt
2010-08-09 11:25 ` Benjamin Herrenschmidt
2018-06-19 22:58 ` Linus Torvalds
2018-06-20 0:02 ` Benjamin Herrenschmidt
2018-06-20 10:31 ` Jiri Kosina
2010-08-05 1:46 Benjamin Herrenschmidt
2010-08-04 22:35 Kumar Gala
2010-06-15 6:29 Benjamin Herrenschmidt
2010-05-25 2:38 Kumar Gala
2010-05-25 10:58 ` Josh Boyer
2010-05-21 9:11 Benjamin Herrenschmidt
2010-05-21 10:22 ` Josh Boyer
2010-05-21 12:42 ` Benjamin Herrenschmidt
2010-05-26 12:38 ` Josh Boyer
2010-05-21 10:37 ` Anton Vorontsov
2010-05-21 13:04 ` Wolfram Sang
2010-05-21 13:04 ` Wolfram Sang
2010-05-21 22:38 ` Benjamin Herrenschmidt
2010-05-21 22:38 ` Benjamin Herrenschmidt
2010-02-27 3:56 Benjamin Herrenschmidt
2010-02-18 4:05 Kumar Gala
2009-12-15 20:20 Kumar Gala
2009-12-12 21:51 Benjamin Herrenschmidt
2009-09-11 7:17 Benjamin Herrenschmidt
2009-09-11 7:17 ` Benjamin Herrenschmidt
2009-09-15 7:30 ` Benjamin Herrenschmidt
2009-09-15 7:30 ` Benjamin Herrenschmidt
2009-09-15 16:53 ` Linus Torvalds
2009-09-15 16:53 ` Linus Torvalds
2009-09-15 21:51 ` Benjamin Herrenschmidt
2009-09-15 21:51 ` Benjamin Herrenschmidt
2009-09-15 22:29 ` Michel Dänzer
2009-09-15 22:29 ` Michel Dänzer
2009-09-15 21:09 ` Geoff Levand
2009-09-15 23:57 ` Michael Ellerman
2009-01-08 5:39 Benjamin Herrenschmidt
2009-01-08 5:39 ` Benjamin Herrenschmidt
2008-12-29 0:05 Paul Mackerras
2008-12-29 0:05 ` Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287018131.2205.50.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=galak@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.