Re: Please pull from 'merge' branch for 2.6.30
Hi Ben, Here are some more commits which got missed in the last merge cycle. I've based this on top of Kumar's pull request from yesterday to minimize merge commits. Note: This pull request replaces my previous pull request. I rebased the series since some of the commits in my previous request have already been merged. If you've already pulled my last request then you don't need to pull this one. Cheers, g. The following changes since commit 2e15eedffaae555085071c68cb94b9eeed2245be: Kumar Gala (1): powerpc/8xx: Update defconfigs are available in the git repository at: git://git.secretlab.ca/git/linux-2.6 merge Grant Likely (2): powerpc/boot: add simpleImage.* to clean-files list powerpc/virtex: Add uImage to the default images list John Linn (1): powerpc/virtex: Fix duplicate level irq events. arch/powerpc/boot/Makefile |2 +- arch/powerpc/platforms/40x/Kconfig |1 + arch/powerpc/platforms/44x/Kconfig |1 + arch/powerpc/sysdev/xilinx_intc.c | 117 --- 4 files changed, 110 insertions(+), 11 deletions(-) On Wed, May 13, 2009 at 4:31 PM, Kumar Gala ga...@kernel.crashing.org wrote: Just added defconfig updates for the normal FSL set of HW. - k Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge to receive the following updates: arch/powerpc/configs/83xx/asp8347_defconfig | 104 - arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 114 -- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 114 -- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 107 -- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 113 -- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 108 -- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 108 -- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 103 - arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 108 -- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 96 - arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 104 - arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 111 -- arch/powerpc/configs/83xx/sbc834x_defconfig | 96 - arch/powerpc/configs/85xx/ksi8560_defconfig | 86 +++- arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 82 +++- arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 89 +++-- arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 88 +++-- arch/powerpc/configs/85xx/sbc8548_defconfig | 84 +++- arch/powerpc/configs/85xx/sbc8560_defconfig | 83 +++- arch/powerpc/configs/85xx/socrates_defconfig | 385 -- arch/powerpc/configs/85xx/stx_gp3_defconfig | 105 -- arch/powerpc/configs/85xx/tqm8540_defconfig | 100 - arch/powerpc/configs/85xx/tqm8541_defconfig | 101 - arch/powerpc/configs/85xx/tqm8548_defconfig | 64 ++- arch/powerpc/configs/85xx/tqm8555_defconfig | 101 - arch/powerpc/configs/85xx/tqm8560_defconfig | 101 - arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 92 - arch/powerpc/configs/86xx/gef_sbc310_defconfig | 92 - arch/powerpc/configs/86xx/gef_sbc610_defconfig | 122 +- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 100 - arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 211 arch/powerpc/configs/86xx/sbc8641d_defconfig | 114 -- arch/powerpc/configs/adder875_defconfig | 65 ++- arch/powerpc/configs/c2k_defconfig | 128 +-- arch/powerpc/configs/ep8248e_defconfig | 74 +++- arch/powerpc/configs/ep88xc_defconfig | 63 ++- arch/powerpc/configs/linkstation_defconfig | 96 - arch/powerpc/configs/mgcoge_defconfig | 74 +++- arch/powerpc/configs/mgsuvd_defconfig | 72 +++- arch/powerpc/configs/mpc7448_hpc2_defconfig | 91 +++-- arch/powerpc/configs/mpc8272_ads_defconfig | 77 +++- arch/powerpc/configs/mpc83xx_defconfig | 115 -- arch/powerpc/configs/mpc866_ads_defconfig | 77 +++- arch/powerpc/configs/mpc86xx_defconfig | 211 arch/powerpc/configs/mpc885_ads_defconfig | 63 ++- arch/powerpc/configs/pq2fads_defconfig | 90 +++-- arch/powerpc/configs/prpmc2800_defconfig | 120 +- arch/powerpc/configs/storcenter_defconfig | 71 ++-- arch/powerpc/sysdev/fsl_soc.c | 46 -- 49 files changed, 3630 insertions(+), 1489 deletions(-) Anton Vorontsov (1): powerpc/fsl_soc: Remove mpc83xx_wdt_init, again Kumar Gala (5): powerpc/83xx: Update defconfigs powerpc/85xx: Update defconfigs powerpc/86xx: Update defconfigs powerpc/embedded6xx: Update defconfigs powerpc/8xx: Update defconfigs
Re: Please pull from 'merge' branch for 2.6.30
On Thu, 2009-05-14 at 10:41 -0600, Grant Likely wrote: Hi Ben, Here are some more commits which got missed in the last merge cycle. I've based this on top of Kumar's pull request from yesterday to minimize merge commits. Note: This pull request replaces my previous pull request. I rebased the series since some of the commits in my previous request have already been merged. If you've already pulled my last request then you don't need to pull this one. What branch ? I don't see them in either your merge or next branch... Cheers, Ben. Cheers, g. The following changes since commit 2e15eedffaae555085071c68cb94b9eeed2245be: Kumar Gala (1): powerpc/8xx: Update defconfigs are available in the git repository at: git://git.secretlab.ca/git/linux-2.6 merge Grant Likely (2): powerpc/boot: add simpleImage.* to clean-files list powerpc/virtex: Add uImage to the default images list John Linn (1): powerpc/virtex: Fix duplicate level irq events. arch/powerpc/boot/Makefile |2 +- arch/powerpc/platforms/40x/Kconfig |1 + arch/powerpc/platforms/44x/Kconfig |1 + arch/powerpc/sysdev/xilinx_intc.c | 117 --- 4 files changed, 110 insertions(+), 11 deletions(-) On Wed, May 13, 2009 at 4:31 PM, Kumar Gala ga...@kernel.crashing.org wrote: Just added defconfig updates for the normal FSL set of HW. - k Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge to receive the following updates: arch/powerpc/configs/83xx/asp8347_defconfig | 104 - arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 114 -- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 114 -- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 107 -- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 113 -- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 108 -- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 108 -- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 103 - arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 108 -- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 96 - arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 104 - arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 111 -- arch/powerpc/configs/83xx/sbc834x_defconfig | 96 - arch/powerpc/configs/85xx/ksi8560_defconfig | 86 +++- arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 82 +++- arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 89 +++-- arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 88 +++-- arch/powerpc/configs/85xx/sbc8548_defconfig | 84 +++- arch/powerpc/configs/85xx/sbc8560_defconfig | 83 +++- arch/powerpc/configs/85xx/socrates_defconfig | 385 -- arch/powerpc/configs/85xx/stx_gp3_defconfig | 105 -- arch/powerpc/configs/85xx/tqm8540_defconfig | 100 - arch/powerpc/configs/85xx/tqm8541_defconfig | 101 - arch/powerpc/configs/85xx/tqm8548_defconfig | 64 ++- arch/powerpc/configs/85xx/tqm8555_defconfig | 101 - arch/powerpc/configs/85xx/tqm8560_defconfig | 101 - arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 92 - arch/powerpc/configs/86xx/gef_sbc310_defconfig| 92 - arch/powerpc/configs/86xx/gef_sbc610_defconfig| 122 +- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 100 - arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 211 arch/powerpc/configs/86xx/sbc8641d_defconfig | 114 -- arch/powerpc/configs/adder875_defconfig | 65 ++- arch/powerpc/configs/c2k_defconfig| 128 +-- arch/powerpc/configs/ep8248e_defconfig| 74 +++- arch/powerpc/configs/ep88xc_defconfig | 63 ++- arch/powerpc/configs/linkstation_defconfig| 96 - arch/powerpc/configs/mgcoge_defconfig | 74 +++- arch/powerpc/configs/mgsuvd_defconfig | 72 +++- arch/powerpc/configs/mpc7448_hpc2_defconfig | 91 +++-- arch/powerpc/configs/mpc8272_ads_defconfig| 77 +++- arch/powerpc/configs/mpc83xx_defconfig| 115 -- arch/powerpc/configs/mpc866_ads_defconfig | 77 +++- arch/powerpc/configs/mpc86xx_defconfig| 211 arch/powerpc/configs/mpc885_ads_defconfig | 63 ++- arch/powerpc/configs/pq2fads_defconfig| 90 +++-- arch/powerpc/configs/prpmc2800_defconfig | 120 +- arch/powerpc/configs/storcenter_defconfig | 71 ++-- arch/powerpc/sysdev/fsl_soc.c | 46 -- 49 files changed, 3630 insertions(+), 1489 deletions(-) Anton Vorontsov (1): powerpc/fsl_soc: Remove mpc83xx_wdt_init, again
Please pull from 'merge' branch for 2.6.30
Just added defconfig updates for the normal FSL set of HW. - k Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge to receive the following updates: arch/powerpc/configs/83xx/asp8347_defconfig | 104 - arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 114 -- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 114 -- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 107 -- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 113 -- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 108 -- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 108 -- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 103 - arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 108 -- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 96 - arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 104 - arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 111 -- arch/powerpc/configs/83xx/sbc834x_defconfig | 96 - arch/powerpc/configs/85xx/ksi8560_defconfig | 86 +++- arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 82 +++- arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 89 +++-- arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 88 +++-- arch/powerpc/configs/85xx/sbc8548_defconfig | 84 +++- arch/powerpc/configs/85xx/sbc8560_defconfig | 83 +++- arch/powerpc/configs/85xx/socrates_defconfig | 385 -- arch/powerpc/configs/85xx/stx_gp3_defconfig | 105 -- arch/powerpc/configs/85xx/tqm8540_defconfig | 100 - arch/powerpc/configs/85xx/tqm8541_defconfig | 101 - arch/powerpc/configs/85xx/tqm8548_defconfig | 64 ++- arch/powerpc/configs/85xx/tqm8555_defconfig | 101 - arch/powerpc/configs/85xx/tqm8560_defconfig | 101 - arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 92 - arch/powerpc/configs/86xx/gef_sbc310_defconfig| 92 - arch/powerpc/configs/86xx/gef_sbc610_defconfig| 122 +- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 100 - arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 211 arch/powerpc/configs/86xx/sbc8641d_defconfig | 114 -- arch/powerpc/configs/adder875_defconfig | 65 ++- arch/powerpc/configs/c2k_defconfig| 128 +-- arch/powerpc/configs/ep8248e_defconfig| 74 +++- arch/powerpc/configs/ep88xc_defconfig | 63 ++- arch/powerpc/configs/linkstation_defconfig| 96 - arch/powerpc/configs/mgcoge_defconfig | 74 +++- arch/powerpc/configs/mgsuvd_defconfig | 72 +++- arch/powerpc/configs/mpc7448_hpc2_defconfig | 91 +++-- arch/powerpc/configs/mpc8272_ads_defconfig| 77 +++- arch/powerpc/configs/mpc83xx_defconfig| 115 -- arch/powerpc/configs/mpc866_ads_defconfig | 77 +++- arch/powerpc/configs/mpc86xx_defconfig| 211 arch/powerpc/configs/mpc885_ads_defconfig | 63 ++- arch/powerpc/configs/pq2fads_defconfig| 90 +++-- arch/powerpc/configs/prpmc2800_defconfig | 120 +- arch/powerpc/configs/storcenter_defconfig | 71 ++-- arch/powerpc/sysdev/fsl_soc.c | 46 -- 49 files changed, 3630 insertions(+), 1489 deletions(-) Anton Vorontsov (1): powerpc/fsl_soc: Remove mpc83xx_wdt_init, again Kumar Gala (5): powerpc/83xx: Update defconfigs powerpc/85xx: Update defconfigs powerpc/86xx: Update defconfigs powerpc/embedded6xx: Update defconfigs powerpc/8xx: Update defconfigs ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Please pull from 'merge' branch for 2.6.30
Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge to receive the following updates: arch/powerpc/sysdev/fsl_soc.c | 46 -- 1 file changed, 46 deletions(-) Anton Vorontsov (1): powerpc/fsl_soc: Remove mpc83xx_wdt_init, again ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Please pull from 'merge' branch for 2.6.30 (updated)
Paul, Can we possibly get this and the other pull requests dealt with and sent to Linus so we might get such fixes in before he tags a -rc4. thanks - k Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge to receive the following updates: arch/powerpc/boot/dts/gef_ppc9a.dts |1 + arch/powerpc/include/asm/mmu.h|6 -- arch/powerpc/include/asm/ppc-opcode.h | 11 +-- arch/powerpc/kernel/cputable.c|2 +- arch/powerpc/mm/tlb_nohash_low.S | 16 ++-- 5 files changed, 5 insertions(+), 31 deletions(-) Kumar Gala (1): Revert powerpc: Add support for early tlbilx opcode Martyn Welch (1): powerpc/86xx: Add device_type entry to soc for ppc9a Stephen Rothwell (1): powerpc: fix for long standing bug noticed by gcc 4.4.0 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Please pull from 'merge' branch for 2.6.30
Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge to receive the following updates: arch/powerpc/include/asm/mmu.h|6 -- arch/powerpc/include/asm/ppc-opcode.h | 11 +-- arch/powerpc/kernel/cputable.c|2 +- arch/powerpc/mm/tlb_nohash_low.S | 16 ++-- 4 files changed, 4 insertions(+), 31 deletions(-) Kumar Gala (1): Revert powerpc: Add support for early tlbilx opcode Stephen Rothwell (1): powerpc: fix for long standing bug noticed by gcc 4.4.0 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Please pull from 'merge' branch for 2.6.30
Please pull from 'merge' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge
to receive the following updates:
arch/powerpc/configs/85xx/mpc8536_ds_defconfig | 1802
arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 1802
arch/powerpc/configs/85xx/mpc8568mds_defconfig | 1309 -
arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 1794
arch/powerpc/configs/mpc85xx_defconfig | 252 +--
arch/powerpc/configs/mpc85xx_smp_defconfig | 1829 +
arch/powerpc/platforms/fsl_uli1575.c |5
arch/powerpc/sysdev/fsl_rio.c | 28
8 files changed, 1959 insertions(+), 6862 deletions(-)
Anton Vorontsov (1):
fsl_rio: Pass the proper device to dma mapping routines
Kumar Gala (4):
powerpc/85xx: Updated generic mpc85xx_defconfig
powerpc/85xx: Enabled a bunch of FSL specific drivers/options
powerpc/85xx: Added SMP defconfig
powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover
Timur Tabi (1):
powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: Please pull from 'merge' branch (for 2.6.30)
On Apr 14, 2009, at 10:31 PM, Paul Mackerras wrote: Kumar Gala writes: Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge Thanks, pulled. I'll collect up a few more patches for .30 and send Linus a pull request shortly. By the way, I'm not planning to run test or next branches while Ben is away. He'll be back in plenty of time to collect the patches for .31 before the next merge window. that's fine. I figured as much for next. - k ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Please pull from 'merge' branch (for 2.6.30)
Please pull from 'merge' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge to receive the following updates: Documentation/powerpc/dts-bindings/fsl/i2c.txt | 46 --- arch/powerpc/boot/dts/tqm8540.dts |4 arch/powerpc/boot/dts/tqm8541.dts |4 arch/powerpc/boot/dts/tqm8548-bigflash.dts |8 - arch/powerpc/boot/dts/tqm8548.dts |8 - arch/powerpc/boot/dts/tqm8555.dts |4 arch/powerpc/boot/dts/tqm8560.dts |4 arch/powerpc/configs/85xx/tqm8548_defconfig| 164 +++-- arch/powerpc/include/asm/mmu.h |6 arch/powerpc/include/asm/ppc-opcode.h | 13 + arch/powerpc/kernel/cputable.c |2 arch/powerpc/mm/tlb_nohash.c |1 arch/powerpc/mm/tlb_nohash_low.S | 14 +- include/linux/fsl_devices.h|4 14 files changed, 126 insertions(+), 156 deletions(-) Kumar Gala (3): powerpc: Fix tlbilx opcode powerpc: Add support for early tlbilx opcode powerpc/mm: Fix compile warning Wolfgang Grandegger (4): powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3 powerpc/85xx: TQM8548: update defconfig powerpc: Document new FSL I2C bindings and cleanup ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
