linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Martin <dave.martin@linaro.org>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: patches@linaro.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	"Alan Cox" <alan@linux.intel.com>,
	"Alessandro Rubini" <rubini@unipv.it>,
	"Alessandro Zummo" <a.zummo@towertech.it>,
	alsa-devel@alsa-project.org, "Chris Ball" <cjb@laptop.org>,
	"Dan Williams" <dan.j.williams@intel.com>,
	"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
	"Grant Likely" <grant.likely@secretlab.ca>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Jassi Brar" <jassisinghbrar@gmail.com>,
	"Julia Lawall" <julia@diku.dk>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	linux-fbdev@vger.kernel.org, linux-input@vger.kernel.org,
	linux-mmc@vger.kernel.org, linux-serial@vger.kernel.org,
	linux-watchdog@vger.kernel.org,
	"Paul Mundt" <lethal@linux-sh.org>,
	"Paweł Moll" <Pawel.Moll@arm.com>,
	rtc-linux@googlegroups.com,
	spi-devel-general@lists.sourceforge.net,
	"Takashi Iwai" <tiwai@suse.de>
Subject: [GIT PULL] ARM: amba: Enable module alias autogeneration for AMBA
Date: Tue, 06 Dec 2011 15:15:41 +0000	[thread overview]
Message-ID: <20111206151541.GA13774@linaro.org> (raw)
In-Reply-To: <1321961573-4562-1-git-send-email-dave.martin@linaro.org>

Hi Russell,

Further to my previous pull request:

> The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37:
> 
>   Linux 3.2-rc2 (2011-11-15 15:02:59 -0200)
> 
> are available in the git repository at:
>   git://git.linaro.org/people/dmart/linux-2.6-arm.git arm/amba-modalias+for-rmk
> 
> Dave Martin (16):
>       ARM: amba: Move definition of struct amba_id to mod_devicetable.h
>       ARM: amba: Auto-generate AMBA driver module aliases during modpost
[...]

... it looks like Alessandro's proposed change to tidy up scripts/mod/
ile2alias.c may get merged soon -- if that happens, you will get a
conflict with the second patch of the series referenced by the previous
pull request.  Fixing it up is straightforward -- if you prefer to
resolve the conflict yourself, that's fine by me.  Alternatively, you
can pull the following modified series instead.

The only difference is in the second patch
("ARM: amba: Auto-generate AMBA driver module aliases during modpost").

Cheers
---Dave

The following changes since commit 114339d31aa813995461866c659bbf07e1cf2267:

  modpost: use table-lookup to build module aliases (2011-12-02 15:18:08 +0000)

are available in the git repository at:
  git://git.linaro.org/people/dmart/linux-2.6-arm.git arm/amba-modalias+alessandro-modalias-v2+for-rmk

Dave Martin (16):
      ARM: amba: Move definition of struct amba_id to mod_devicetable.h
      ARM: amba: Auto-generate AMBA driver module aliases during modpost
      hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
      dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
      dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
      gpio: pl061: Enable module alias autogeneration for AMBA drivers
      input: ambakmi: Enable module alias autogeneration for AMBA drivers
      mmc: mmci: Enable module alias autogeneration for AMBA drivers
      rtc: pl030: Enable module alias autogeneration for AMBA drivers
      rtc: pl031: Enable module alias autogeneration for AMBA drivers
      spi: pl022: Enable module alias autogeneration for AMBA drivers
      serial: pl010: Enable module alias autogeneration for AMBA drivers
      serial: pl011: Enable module alias autogeneration for AMBA drivers
      fbdev: amba: Enable module alias autogeneration for AMBA drivers
      watchdog: sp805: Enable module alias autogeneration for AMBA drivers
      sound: aaci: Enable module alias autogeneration for AMBA drivers

 drivers/amba/bus.c                   |    4 ++
 drivers/char/hw_random/nomadik-rng.c |    2 +
 drivers/dma/amba-pl08x.c             |    2 +
 drivers/dma/pl330.c                  |    2 +
 drivers/gpio/gpio-pl061.c            |    2 +
 drivers/input/serio/ambakmi.c        |    2 +
 drivers/mmc/host/mmci.c              |    2 +
 drivers/rtc/rtc-pl030.c              |    2 +
 drivers/rtc/rtc-pl031.c              |    2 +
 drivers/spi/spi-pl022.c              |    2 +
 drivers/tty/serial/amba-pl010.c      |    2 +
 drivers/tty/serial/amba-pl011.c      |    2 +
 drivers/video/amba-clcd.c            |    2 +
 drivers/watchdog/sp805_wdt.c         |    2 +
 include/linux/amba/bus.h             |    7 +---
 include/linux/mod_devicetable.h      |   18 +++++++++
 scripts/mod/file2alias.c             |   71 +++++++++++++++++++++++++++++++++-
 sound/arm/aaci.c                     |    2 +
 18 files changed, 121 insertions(+), 7 deletions(-)

  parent reply	other threads:[~2011-12-06 15:15 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-22 11:32 [GIT PULL] ARM: amba: Enable module alias autogeneration for AMBA drivers Dave Martin
2011-11-22 11:56 ` [GIT PULL] ARM: amba: Enable module alias autogeneration for Alessandro Rubini
2011-11-22 12:07   ` Dave Martin
     [not found]   ` <20111122120756.GF2066-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2011-11-22 15:19     ` Alessandro Rubini
2011-11-22 19:20   ` Greg KH
2011-12-06 15:15 ` Dave Martin [this message]
     [not found] ` <20111206151541.GA13774-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-12-06 15:59   ` Alessandro Rubini
2011-12-06 16:18     ` Dave Martin
2011-12-19 13:24       ` Dave Martin
2011-12-19 21:39         ` Russell King - ARM Linux
2011-12-22 11:21           ` Dave Martin
2011-12-22 18:50             ` Russell King - ARM Linux

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=20111206151541.GA13774@linaro.org \
    --to=dave.martin@linaro.org \
    --cc=Pawel.Moll@arm.com \
    --cc=a.zummo@towertech.it \
    --cc=alan@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=cjb@laptop.org \
    --cc=dan.j.williams@intel.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=grant.likely@secretlab.ca \
    --cc=jassisinghbrar@gmail.com \
    --cc=julia@diku.dk \
    --cc=lethal@linux-sh.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=patches@linaro.org \
    --cc=perex@perex.cz \
    --cc=rtc-linux@googlegroups.com \
    --cc=rubini@unipv.it \
    --cc=spi-devel-general@lists.sourceforge.net \
    --cc=tiwai@suse.de \
    /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 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).