* [GIT PULL 0/3] arm-soc updates
@ 2012-08-10 19:06 Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 2/3] arm-soc: late at91 changes Arnd Bergmann
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Arnd Bergmann @ 2012-08-10 19:06 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
Here are three pull requests for you to consider for the next -rc.
The first one is our regular bug fix series, this time with a lot
of patches fixing build regressions. Please pull at least this one.
The other two are things that fell through the cracks in the v3.6
merge window because of communication problems between the arm-soc
team and our downstream maintainers. Neither of them is important,
but applying them should also be harmless. If you feel like making
an exception, please have a look and consider merging them as well,
but don't worry about them otherwise.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 2/3] arm-soc: late at91 changes
2012-08-10 19:06 [GIT PULL 0/3] arm-soc updates Arnd Bergmann
@ 2012-08-10 19:06 ` Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 1/3] arm-soc: bug fixes for v3.6-rc2 Arnd Bergmann
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2012-08-10 19:06 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/late-at91-mci
for you to fetch changes up to b3ce167791c02da98f6e527be7d19213b3abddf0:
Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci (2012-08-10 12:34:18 +0200)
----------------------------------------------------------------
arm-soc: late at91 changes
This series was originally sent for inclusion in v3.5 but missed out
twice, first time because it was late for v3.5 and we decided not to
push it then, and this time because the maintainer was on a long
vacation before the merge window and nobody noticed that it was missing
from the v3.6 list.
The main purpose of this series is to move over the at91 board files
to use the atmel-mci driver instead of the old at91_mci that is
scheduled for removal in v3.7.
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
----------------------------------------------------------------
Arnd Bergmann (1):
Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci
Ludovic Desroches (1):
ARM: at91: add atmel-mci support for chips and boards which can use it
Nicolas Ferre (1):
ARM: at91/defconfig: change the MCI driver to use in defconfigs
Paul Bolle (1):
ARM: at91: set i2c_board_info.type to "ds1339" directly
Richard Genoud (1):
ARM: at91/defconfig: Remove unaffected config option
arch/arm/configs/afeb9260_defconfig | 1 -
arch/arm/configs/at91rm9200_defconfig | 2 +-
arch/arm/configs/at91sam9261_defconfig | 2 +-
arch/arm/configs/at91sam9263_defconfig | 3 +-
arch/arm/configs/at91sam9g20_defconfig | 2 +-
arch/arm/configs/at91sam9rl_defconfig | 2 +-
arch/arm/configs/cpu9260_defconfig | 2 +-
arch/arm/configs/cpu9g20_defconfig | 2 +-
arch/arm/configs/qil-a9260_defconfig | 3 +-
arch/arm/configs/stamp9g20_defconfig | 1 -
arch/arm/configs/usb-a9260_defconfig | 1 -
arch/arm/mach-at91/at91rm9200_devices.c | 92 ++++++++++-------
arch/arm/mach-at91/at91sam9260_devices.c | 84 +---------------
arch/arm/mach-at91/at91sam9261_devices.c | 60 +++++------
arch/arm/mach-at91/at91sam9263.c | 4 +-
arch/arm/mach-at91/at91sam9263_devices.c | 161 +++++++++++++++++-------------
arch/arm/mach-at91/at91sam9rl_devices.c | 60 +++++------
arch/arm/mach-at91/board-afeb-9260v1.c | 14 +--
arch/arm/mach-at91/board-carmeva.c | 14 +--
arch/arm/mach-at91/board-cpu9krea.c | 17 ++--
arch/arm/mach-at91/board-cpuat91.c | 13 +--
arch/arm/mach-at91/board-csb337.c | 14 +--
arch/arm/mach-at91/board-eb9200.c | 14 +--
arch/arm/mach-at91/board-ecbat91.c | 14 +--
arch/arm/mach-at91/board-eco920.c | 14 +--
arch/arm/mach-at91/board-flexibity.c | 14 +--
arch/arm/mach-at91/board-foxg20.c | 16 +--
arch/arm/mach-at91/board-kb9202.c | 14 +--
arch/arm/mach-at91/board-neocore926.c | 13 +--
arch/arm/mach-at91/board-picotux200.c | 14 +--
arch/arm/mach-at91/board-qil-a9260.c | 14 +--
arch/arm/mach-at91/board-rm9200dk.c | 14 +--
arch/arm/mach-at91/board-rm9200ek.c | 14 +--
arch/arm/mach-at91/board-rsi-ews.c | 13 +--
arch/arm/mach-at91/board-sam9-l9260.c | 16 +--
arch/arm/mach-at91/board-sam9260ek.c | 16 +--
arch/arm/mach-at91/board-sam9261ek.c | 13 +--
arch/arm/mach-at91/board-sam9263ek.c | 13 +--
arch/arm/mach-at91/board-sam9g20ek.c | 16 +--
arch/arm/mach-at91/board-sam9rlek.c | 13 +--
arch/arm/mach-at91/board-stamp9g20.c | 14 ---
arch/arm/mach-at91/board-usb-a926x.c | 2 -
arch/arm/mach-at91/board-yl-9200.c | 13 +--
drivers/mtd/nand/Kconfig | 40 --------
44 files changed, 384 insertions(+), 494 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 1/3] arm-soc: bug fixes for v3.6-rc2
2012-08-10 19:06 [GIT PULL 0/3] arm-soc updates Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 2/3] arm-soc: late at91 changes Arnd Bergmann
@ 2012-08-10 19:06 ` Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 3/3] arm-soc: make of_device_id->data constant Arnd Bergmann
2012-08-13 18:58 ` [GIT PULL 0/3] arm-soc updates Sascha Hauer
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2012-08-10 19:06 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to de9234306bb28fe6c8c3bb908e3f9956f5276a02:
ARM: davinci: remove broken ntosd2_init_i2c (2012-08-10 13:14:36 +0200)
----------------------------------------------------------------
arm-soc: bug fixes for v3.6-rc2
These are a bunch of bug fixes that came in after the merge window and
one update for the MAINTAINERS file. The largest part of the fixes
are patches that address bugs found by building all the ARM defconfig
files. There are a lot more warnings that we have patches for, but
the others are either still under discussion or are harmless and
do not cause actual problems besides making the build slightly noisy.
----------------------------------------------------------------
Arnd Bergmann (19):
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
mfd/asic3: fix asic3_mfd_probe return value
usb/ohci-omap: remove unused variable
ARM: pxa: remove irq_to_gpio from ezx-pcap driver
Input: eeti_ts: pass gpio value instead of IRQ
ARM: sa1100: include linux/io.h in hackkit leds code
ARM: s3c24xx: use new PWM driver
ARM: integrator: include <linux/export.h>
ARM: imx: gpmi-nand depends on mxs-dma
ARM: exynos: exynos_pm_add_dev_to_genpd may be unused
gpio: em: do not discard em_gio_irq_domain_cleanup
mtd/omap2: fix dmaengine_slave_config error handling
spi/s3c64xx: improve error handling
omap-rng: fix use of SIMPLE_DEV_PM_OPS
Merge branch 'testing/new-warnings' into fixes
ARM: s3c24xx: enable CONFIG_BUG for tct_hammer
ARM: davinci: remove broken ntosd2_init_i2c
Fabio Estevam (5):
ARM: dts: imx27-3ds.dts: Fix serial console node
ARM: imx6q-sabrelite: Setup CLKO IOMUX
ARM: mx23: Fix registers range
ARM: mx28: Fix registers range
ARM: clk-imx31: Fix the keypad clock name
Javier Martin (1):
i.MX27: Fix emma-prp and csi clocks.
Linus Walleij (2):
MAINTAINERS: update entry for Linus Walleij
ARM: integrator: use clk_prepare_enable() for timer
Marc Kleine-Budde (1):
ARM: mxs: always build ocotp
Marek Vasut (1):
ARM: mxs: Remove MMAP_MIN_ADDR setting from mxs_defconfig
Sebastian Hesselbarth (1):
ARM: kirkwood: fix typo in Makefile.boot
Shawn Guo (3):
ARM: imx: enable emi_slow_gate clock for imx5
ARM: dts: imx53-ard: add regulators for lan9220
ARM: dts: imx: fix gpio interrupts property
Stephen Warren (1):
ARM: tegra: more regulator fixes for Harmony
MAINTAINERS | 17 ++++---
arch/arm/boot/dts/imx23.dtsi | 52 ++++++++++----------
arch/arm/boot/dts/imx27-3ds.dts | 2 +-
arch/arm/boot/dts/imx28.dtsi | 74 ++++++++++++++---------------
arch/arm/boot/dts/imx51-babbage.dts | 2 +-
arch/arm/boot/dts/imx53-ard.dts | 22 ++++++++-
arch/arm/boot/dts/imx6q-sabrelite.dts | 1 +
arch/arm/configs/imx_v6_v7_defconfig | 1 +
arch/arm/configs/mxs_defconfig | 1 -
arch/arm/configs/tct_hammer_defconfig | 2 +-
arch/arm/mach-davinci/board-neuros-osd2.c | 39 ---------------
arch/arm/mach-exynos/pm_domains.c | 2 +-
arch/arm/mach-imx/clk-imx27.c | 8 ++--
arch/arm/mach-imx/clk-imx31.c | 2 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 1 +
arch/arm/mach-integrator/core.c | 1 +
arch/arm/mach-integrator/integrator_ap.c | 2 +-
arch/arm/mach-kirkwood/Makefile.boot | 4 +-
arch/arm/mach-mxs/Kconfig | 6 ---
arch/arm/mach-mxs/Makefile | 3 +-
arch/arm/mach-pxa/raumfeld.c | 2 +-
arch/arm/mach-s3c24xx/Kconfig | 4 +-
arch/arm/mach-sa1100/leds-hackkit.c | 1 +
arch/arm/mach-tegra/board-harmony-power.c | 32 +++++++------
arch/arm/plat-samsung/Kconfig | 3 +-
drivers/char/hw_random/omap-rng.c | 2 +-
drivers/gpio/gpio-em.c | 2 +-
drivers/input/touchscreen/eeti_ts.c | 21 ++++----
drivers/mfd/asic3.c | 1 +
drivers/mfd/ezx-pcap.c | 2 +-
drivers/mtd/nand/Kconfig | 2 +-
drivers/mtd/nand/omap2.c | 7 ++-
drivers/spi/spi-s3c64xx.c | 2 +-
drivers/usb/host/ohci-omap.c | 2 -
include/linux/input/eeti_ts.h | 1 +
include/linux/mfd/ezx-pcap.h | 1 +
36 files changed, 160 insertions(+), 167 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 3/3] arm-soc: make of_device_id->data constant
2012-08-10 19:06 [GIT PULL 0/3] arm-soc updates Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 2/3] arm-soc: late at91 changes Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 1/3] arm-soc: bug fixes for v3.6-rc2 Arnd Bergmann
@ 2012-08-10 19:06 ` Arnd Bergmann
2012-08-13 18:58 ` [GIT PULL 0/3] arm-soc updates Sascha Hauer
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2012-08-10 19:06 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/late-warnings
for you to fetch changes up to 100e8f5fda756fe71d21c0ea68d67e56f5f05167:
Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into late/warnings (2012-07-24 16:58:51 +0200)
----------------------------------------------------------------
arm-soc: make of_device_id->data constant
This patch series from Uwe Kleine-K?nigwas meant to go into
the v3.6 merge window, but got lost in a small miscommunication
between Olof and me. It gets rid of a (harmless) gcc warning
by making the of_device_id->data pointer constant, which is
generally considered to be a good idea.
Cc: "Uwe Kleine-K?nig" <u.kleine-koenig@pengutronix.de>
----------------------------------------------------------------
Arnd Bergmann (7):
watchdog/mpc8xxx: add a const qualifier
powerpc/fsl_msi: drop unneeded cast to non-const pointer
mfd/da9052: make i2c_device_id array const
i2c/mpc: make data used as *of_device_id.data const
macintosh/mediabay: make data used as *of_device_id.data const
can: mpc5xxx_can: make data used as *of_device_id.data const
Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into late/warnings
Marc Kleine-Budde (1):
can: mpc5xxx_can: make data in mpc5xxx_can_probe const
Uwe Kleine-K?nig (18):
spi/imx: make spi_imx_data.devtype_data member point to const data
spi/spi-omap2-mcspi: add a const qualifier
serial/imx: make imx_port.devdata member point to const data
serial/mpc52xx_uart: add a const qualifier
ARM: cache-l2x0: add a const qualifier
misc/atmel_tc: make atmel_tc.tcb_config member point to const data
gpio/gpio-omap.c: add a const qualifier
gpio/mpc8xxx: add a const qualifier
i2c/i2c-omap: add a const qualifier
i2c/mpc: add a const qualifier
dmaengine: at_hdmac: add a few const qualifiers
mmc/omap_hsmmc: add a const qualifier
macintosh/mediabay: add a const qualifier
powerpc/83xx: add a const qualifier
powerpc/fsl_msi: add a const qualifier
powerpc/celleb_pci: add a const qualifier
of: add const to struct *of_device_id.data
gpio/gpio-omap: make platformdata used as *of_device_id.data const
arch/arm/mm/cache-l2x0.c | 2 +-
arch/powerpc/platforms/83xx/suspend.c | 2 +-
arch/powerpc/platforms/cell/celleb_pci.c | 2 +-
arch/powerpc/sysdev/fsl_msi.c | 8 ++++----
drivers/dma/at_hdmac.c | 4 ++--
drivers/gpio/gpio-mpc8xxx.c | 2 +-
drivers/gpio/gpio-omap.c | 8 ++++----
drivers/i2c/busses/i2c-mpc.c | 12 ++++++------
drivers/i2c/busses/i2c-omap.c | 3 ++-
drivers/macintosh/mediabay.c | 8 ++++----
drivers/mfd/da9052-i2c.c | 4 ++--
drivers/mmc/host/omap_hsmmc.c | 2 +-
drivers/net/can/mscan/mpc5xxx_can.c | 6 +++---
drivers/spi/spi-imx.c | 2 +-
drivers/spi/spi-omap2-mcspi.c | 2 +-
drivers/tty/serial/imx.c | 2 +-
drivers/tty/serial/mpc52xx_uart.c | 2 +-
drivers/watchdog/mpc8xxx_wdt.c | 2 +-
include/linux/atmel_tc.h | 2 +-
include/linux/mod_devicetable.h | 2 +-
20 files changed, 39 insertions(+), 38 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 0/3] arm-soc updates
2012-08-10 19:06 [GIT PULL 0/3] arm-soc updates Arnd Bergmann
` (2 preceding siblings ...)
2012-08-10 19:06 ` [GIT PULL 3/3] arm-soc: make of_device_id->data constant Arnd Bergmann
@ 2012-08-13 18:58 ` Sascha Hauer
2012-08-13 21:13 ` Olof Johansson
3 siblings, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2012-08-13 18:58 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
On Fri, Aug 10, 2012 at 09:06:12PM +0200, Arnd Bergmann wrote:
> Hi Linus,
>
> Here are three pull requests for you to consider for the next -rc.
How do you send multiple pull requests? Is there some git foo available
or do you do this manually?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 0/3] arm-soc updates
2012-08-13 18:58 ` [GIT PULL 0/3] arm-soc updates Sascha Hauer
@ 2012-08-13 21:13 ` Olof Johansson
0 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-08-13 21:13 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 13, 2012 at 11:58 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Arnd,
>
> On Fri, Aug 10, 2012 at 09:06:12PM +0200, Arnd Bergmann wrote:
>> Hi Linus,
>>
>> Here are three pull requests for you to consider for the next -rc.
>
> How do you send multiple pull requests? Is there some git foo available
> or do you do this manually?
For truly trivial multi-branch pulls, I just generate each
individually. For the merge windows we tend to have several branches
touching the same files, so diffstats would be harder to compare that
way.
So, this is my workflow. I think Arnd's is quite similar since my
script is based on an early version of what I got from him:
* Start a dummy branch based on latest upstream version
* For each branch to pull:
- Merge in the branch to make sure you document/resolve conflicts
- Generate pull request email (save to file)
- Push resolved branch (if you want to provide that)
* Edit the saved pull requests to modify the x/y fields
* Send them (with git send-mail --annotate for cover letter)
I have a script that generates the pull-request email in a format that
git send-email accepts (i.e. it has a From/Subject header). It's not
very pretty, but for reference I included a copy below.
#!/bin/sh
# Usage: my-request-pull <tagname>, run from a branch that is checked out
# with the branch you wish to request pulled merged in as the top commit.
echo "From: $(git config --get user.name) <$(git config --get user.email)>"
echo -n Subject: [GIT PULL x/y]\
git tag -n20 -l $1 | sed -e 's:^[-a-z0-9]* *::g'
echo
echo "----------------------------------------------------------------"
echo
SHA=$(git log --pretty=oneline -1 HEAD~ | cut -d' ' -f 1)
DESC=$(git log --pretty=oneline -1 HEAD~ | cut -d' ' -f 1 --complement)
echo "The following changes since commit $SHA:"
echo
echo " $DESC"
echo
echo "are available in the git repository at:"
echo
echo " git://EDIT_YOUR_URL_IN_HERE tags/$1"
echo
SHA=$(git log --pretty=oneline -1 $1 | cut -d' ' -f 1)
DESC=$(git log --pretty=oneline -1 $1 | cut -d' ' -f 1 --complement)
echo "for you to fetch changes up to $SHA:"
echo
echo " $DESC"
echo
echo "----------------------------------------------------------------"
echo
git shortlog HEAD~..$1
echo
git diff -M --stat=75 --summary HEAD~ | cat
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-08-13 21:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-10 19:06 [GIT PULL 0/3] arm-soc updates Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 2/3] arm-soc: late at91 changes Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 1/3] arm-soc: bug fixes for v3.6-rc2 Arnd Bergmann
2012-08-10 19:06 ` [GIT PULL 3/3] arm-soc: make of_device_id->data constant Arnd Bergmann
2012-08-13 18:58 ` [GIT PULL 0/3] arm-soc updates Sascha Hauer
2012-08-13 21:13 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).