| Message ID | 20120516063552.GA5154@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Wednesday 16 May 2012, Mike Turquette wrote: > Arnd & Olof, > > Please pull my clk-next branch. This is an update on top of the last > pull request I sent you (already in arm-soc). > > This series is mostly Orion/Kirkwood support accompanied by two small > core changes > > The following changes since commit f0948f59dbc8e725a96ba16da666e8f5cdd43ba8: > > clk: add a fixed factor clock (2012-05-08 14:13:25 -0700) > > are available in the git repository at: > > git://git.linaro.org/people/mturquette/linux.git clk-next > Pulled into the next/clock branch, Thanks! Olof, I've rebuild the for-next branch now, and I don't plan to work tomorrow, or very much on Friday. I think we're good with the merge conflicts between arm-soc branches and with rmk/for-next at the moment. Please handle incoming pull requests at least for tomorrow. I'll also be travelling for the next three weeks, so you might have to send most of the stuff onwards to Linus. I'll try to cook up descriptions for the branches and put them into the contents file in the meantime. Arnd
On Wed, May 16, 2012 at 11:39 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Wednesday 16 May 2012, Mike Turquette wrote: >> Arnd & Olof, >> >> Please pull my clk-next branch. This is an update on top of the last >> pull request I sent you (already in arm-soc). >> >> This series is mostly Orion/Kirkwood support accompanied by two small >> core changes >> >> The following changes since commit f0948f59dbc8e725a96ba16da666e8f5cdd43ba8: >> >> clk: add a fixed factor clock (2012-05-08 14:13:25 -0700) >> >> are available in the git repository at: >> >> git://git.linaro.org/people/mturquette/linux.git clk-next >> > > Pulled into the next/clock branch, > > Thanks! > > Olof, I've rebuild the for-next branch now, and I don't plan to > work tomorrow, or very much on Friday. I think we're good with the > merge conflicts between arm-soc branches and with rmk/for-next > at the moment. > > Please handle incoming pull requests at least for tomorrow. I'll > also be travelling for the next three weeks, so you might have to > send most of the stuff onwards to Linus. I'll try to cook up > descriptions for the branches and put them into the contents > file in the meantime. Sounds good. Are you planning on sending the last couple of fixes out before wrapping things up? If I haven't seen a request go out by tomorrow I'll do it, I suppose. -Olof
On Wednesday 16 May 2012, Olof Johansson wrote: > > Are you planning on sending the last couple of fixes out before > wrapping things up? If I haven't seen a request go out by tomorrow > I'll do it, I suppose. I was planning to, but it's getting rather late here in Germany so maybe you can take care of this, too. I've just fixed up two of the next/* branches that caused build regressions (one was my fault, the other one came from samsung/board2) and started building the defconfigs for linux-next, which looks rather bad, so I probably won't spend much time trying to fix them up, see below for how far I got. Arnd ---- acs5k_defconfig acs5k_defconfig Generating include/generated/mach-types.h /home/arnd/linux-arm/arch/arm/mm/dma-mapping.c: In function 'arm_dma_alloc': /home/arnd/linux-arm/arch/arm/mm/dma-mapping.c:675:15: error: 'page' may be used uninitialized in this function [-Werror=uninitialized] cc1: all warnings being treated as errors make[2]: *** [arch/arm/mm/dma-mapping.o] Error 1 make[1]: *** [arch/arm/mm] Error 2 make[1]: *** Waiting for unfinished jobs.... /home/arnd/linux-arm/kernel/user.c:30:4: error: this decimal constant is unsigned only in ISO C90 [-Werror] /home/arnd/linux-arm/kernel/user.c:38:4: error: this decimal constant is unsigned only in ISO C90 [-Werror] cc1: all warnings being treated as errors acs5k_tiny_defconfig afeb9260_defconfig ag5evm_defconfig /home/arnd/linux-arm/arch/arm/mach-shmobile/clock-sh73a0.c: In function 'sh73a0_clock_init': /home/arnd/linux-arm/arch/arm/mach-shmobile/clock-sh73a0.c:615:3: error: 'sh_clk_mstp32_register' is deprecated (declared at /home/arnd/linux-arm/include/linux/sh_clk.h:138) [-Werror=deprecated-declarations] cc1: all warnings being treated as errors make[2]: *** [arch/arm/mach-shmobile/clock-sh73a0.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/arm/mach-shmobile] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [sub-make] Error 2 am200epdkit_defconfig ap4evb_defconfig /home/arnd/linux-arm/arch/arm/mach-shmobile/clock-sh7372.c: In function 'sh7372_clock_init': /home/arnd/linux-arm/arch/arm/mach-shmobile/clock-sh7372.c:707:3: error: 'sh_clk_mstp32_register' is deprecated (declared at /home/arnd/linux-arm/include/linux/sh_clk.h:138) [-Werror=deprecated-declarations] cc1: all warnings being treated as errors make[2]: *** [arch/arm/mach-shmobile/clock-sh7372.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/arm/mach-shmobile] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [sub-make] Error 2 armadillo800eva_defconfig assabet_defconfig at91_dt_defconfig /home/arnd/linux-arm/drivers/usb/gadget/at91_udc.c: In function 'at91_ep_enable': /home/arnd/linux-arm/drivers/usb/gadget/at91_udc.c:478:18: error: 'struct at91_ep' has no member named 'desc' make[4]: *** [drivers/usb/gadget/at91_udc.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [drivers/usb/gadget] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [drivers/usb] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [sub-make] Error 2 at91rm9200_defconfig at91sam9260_defconfig at91sam9261_defconfig at91sam9263_defconfig /home/arnd/linux-arm/fs/fuse/control.c: In function 'fuse_conn_congestion_threshold_write': /home/arnd/linux-arm/fs/fuse/control.c:165:29: error: 'val' may be used uninitialized in this function [-Werror=uninitialized] /home/arnd/linux-arm/fs/fuse/control.c: In function 'fuse_conn_max_background_write': /home/arnd/linux-arm/fs/fuse/control.c:128:23: error: 'val' may be used uninitialized in this function [-Werror=uninitialized] cc1: all warnings being treated as errors make[3]: *** [fs/fuse/control.o] Error 1 make[2]: *** [fs/fuse] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [fs] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [sub-make] Error 2 at91sam9g20_defconfig at91sam9g45_defconfig at91sam9rl_defconfig at91x40_defconfig badge4_defconfig bcmring_defconfig bcmring_defconfig.rej bonito_defconfig cam60_defconfig
On Wed, May 16, 2012 at 1:52 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Wednesday 16 May 2012, Olof Johansson wrote: >> >> Are you planning on sending the last couple of fixes out before >> wrapping things up? If I haven't seen a request go out by tomorrow >> I'll do it, I suppose. > > I was planning to, but it's getting rather late here in Germany > so maybe you can take care of this, too. Sure. > I've just fixed up two of the next/* branches that caused build regressions > (one was my fault, the other one came from samsung/board2) and started > building the defconfigs for linux-next, which looks rather bad, so I probably > won't spend much time trying to fix them up, see below for how far I got. Hmm. The _errors_ i get with next-0516 isn't nearly that bad but I think you build with -Werror? What I see here with last night's build is below. Some of these have been broken for a very long time (ixp4xx for example). buildall.arm.at91_dt_defconfig.log.failed:drivers/usb/gadget/at91_udc.c:478:18: error: 'struct at91_ep' has no member named 'desc' buildall.arm.ezx_defconfig.log.failed:drivers/mfd/ezx-pcap.c:205:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:218:2: error: implicit declaration of function '__gpio_get_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:224:2: error: implicit declaration of function '__gpio_set_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:218:2: error: implicit declaration of function '__gpio_get_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:224:2: error: implicit declaration of function '__gpio_set_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:218:2: error: implicit declaration of function '__gpio_get_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:224:2: error: implicit declaration of function '__gpio_set_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:218:2: error: implicit declaration of function '__gpio_get_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:224:2: error: implicit declaration of function '__gpio_set_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:218:2: error: implicit declaration of function '__gpio_get_value' [-Werror=implicit-function-declaration] buildall.arm.ixp4xx_defconfig.log.failed:include/asm-generic/gpio.h:224:2: error: implicit declaration of function '__gpio_set_value' [-Werror=implicit-function-declaration] buildall.arm.kota2_defconfig.log.failed:arch/arm/mach-shmobile/platsmp.c:29:2: error: implicit declaration of function 'of_machine_is_compatible' [-Werror=implicit-function-declaration] buildall.arm.kzm9g_defconfig.log.failed:arch/arm/mach-shmobile/platsmp.c:29:2: error: implicit declaration of function 'of_machine_is_compatible' [-Werror=implicit-function-declaration] buildall.arm.marzen_defconfig.log.failed:arch/arm/mach-shmobile/platsmp.c:29:2: error: implicit declaration of function 'of_machine_is_compatible' [-Werror=implicit-function-declaration] buildall.arm.marzen_defconfig.log.failed:fs/inode.c:1775:6: error: redefinition of 'inode_dio_wait' buildall.arm.mv78xx0_defconfig.log.failed:arch/arm/mach-mv78xx0/pcie.c:256:29: error: 'bus' undeclared (first use in this function) buildall.arm.netx_defconfig.log.failed:arch/arm/mach-netx/fb.c:72:6: error: redefinition of 'clk_disable' buildall.arm.netx_defconfig.log.failed:arch/arm/mach-netx/fb.c:76:5: error: redefinition of 'clk_set_rate' buildall.arm.netx_defconfig.log.failed:arch/arm/mach-netx/fb.c:81:5: error: redefinition of 'clk_enable' buildall.arm.netx_defconfig.log.failed:arch/arm/mach-netx/fb.c:86:13: error: redefinition of 'clk_get' buildall.arm.netx_defconfig.log.failed:arch/arm/mach-netx/fb.c:91:6: error: redefinition of 'clk_put' buildall.arm.prima2_defconfig.log.failed:drivers/spi/spi-sirf.c:563:2: error: implicit declaration of function 'pinmux_get' [-Werror=implicit-function-declaration] buildall.arm.prima2_defconfig.log.failed:drivers/spi/spi-sirf.c:568:2: error: implicit declaration of function 'pinmux_enable' [-Werror=implicit-function-declaration] buildall.arm.prima2_defconfig.log.failed:drivers/spi/spi-sirf.c:602:2: error: implicit declaration of function 'pinmux_disable' [-Werror=implicit-function-declaration] buildall.arm.prima2_defconfig.log.failed:drivers/spi/spi-sirf.c:603:2: error: implicit declaration of function 'pinmux_put' [-Werror=implicit-function-declaration] buildall.arm.raumfeld_defconfig.log.failed:drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] buildall.arm.tegra_defconfig.log.failed:drivers/iommu/tegra-smmu.c:930:2: error: implicit declaration of function 'of_get_dma_window' [-Werror=implicit-function-declaration] buildall.arm.xcep_defconfig.log.failed:fs/inode.c:1775:6: error: redefinition of 'inode_dio_wait' buildall.arm.xcep_defconfig.log.failed:fs/nfs/direct.c:459:2: error: implicit declaration of function 'inode_dio_done' [-Werror=implicit-function-declaration] -Olof
Arnd & Olof, Please pull my clk-next branch. This is an update on top of the last pull request I sent you (already in arm-soc). This series is mostly Orion/Kirkwood support accompanied by two small core changes The following changes since commit f0948f59dbc8e725a96ba16da666e8f5cdd43ba8: clk: add a fixed factor clock (2012-05-08 14:13:25 -0700) are available in the git repository at: git://git.linaro.org/people/mturquette/linux.git clk-next for you to fetch changes up to 7e0fa1b5fa91d9aa456d102c273b2cf0f2e95d39: clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate(). (2012-05-15 22:42:10 -0700) ---------------------------------------------------------------- Andrew Lunn (14): ARM: Orion: Add clocks using the generic clk infrastructure. ARM: Orion: SPI: Add clk/clkdev support. ARM: Orion: Eth: Add clk/clkdev support. ARM: Orion: WDT: Add clk/clkdev support ARM: Orion: UART: Get the clock rate via clk_get_rate(). ARM: Orion: SATA: Add per channel clk/clkdev support. ARM: Orion: EHCI: Add support for enabling clocks ARM: Orion: NAND: Add support for clk, if there is one. ARM: Orion: SDIO: Add support for clk. ARM: Orion: CESA: Add support for clk ARM: Orion: XOR: Add support for clk ARM: Orion: PCIE: Add support for clk ARM: Orion: Audio: Add clk/clkdev support ARM: Kirkwood: Replace clock gating Mark Brown (1): clk: Provide dummy clk_unregister() Saravana Kannan (1): clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate(). arch/arm/Kconfig | 1 + arch/arm/mach-dove/common.c | 39 +-- arch/arm/mach-dove/dove-db-setup.c | 1 - arch/arm/mach-kirkwood/board-dreamplug.c | 1 - arch/arm/mach-kirkwood/board-dt.c | 3 + arch/arm/mach-kirkwood/common.c | 274 ++++++++++++++------- arch/arm/mach-kirkwood/common.h | 1 + arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 16 ++ arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 1 - arch/arm/mach-kirkwood/pcie.c | 25 +- arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 1 - arch/arm/mach-kirkwood/t5325-setup.c | 1 - arch/arm/mach-kirkwood/tsx1x-common.c | 1 - arch/arm/mach-mv78xx0/common.c | 45 ++-- arch/arm/mach-orion5x/common.c | 27 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 - arch/arm/plat-orion/common.c | 104 ++++---- arch/arm/plat-orion/include/plat/common.h | 34 +-- arch/arm/plat-orion/include/plat/orion_wdt.h | 18 -- arch/arm/plat-orion/pcie.c | 4 +- drivers/ata/sata_mv.c | 40 ++- drivers/clk/clk.c | 11 +- drivers/crypto/mv_cesa.c | 14 ++ drivers/dma/mv_xor.c | 15 ++ drivers/dma/mv_xor.h | 1 + drivers/mmc/host/mvsdio.c | 14 ++ drivers/mtd/nand/orion_nand.c | 18 ++ drivers/net/ethernet/marvell/mv643xx_eth.c | 42 +++- drivers/spi/spi-orion.c | 30 ++- drivers/usb/host/ehci-orion.c | 16 ++ drivers/watchdog/orion_wdt.c | 16 +- include/linux/clk-provider.h | 2 + include/linux/mv643xx_eth.h | 1 - include/linux/spi/orion_spi.h | 17 -- sound/soc/kirkwood/kirkwood-i2s.c | 13 + sound/soc/kirkwood/kirkwood.h | 1 + 36 files changed, 585 insertions(+), 264 deletions(-) delete mode 100644 arch/arm/plat-orion/include/plat/orion_wdt.h delete mode 100644 include/linux/spi/orion_spi.h