From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>,
spi-devel-general@lists.sourceforge.net,
devicetree-discuss@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, rob.herring@calxeda.com,
grant.likely@secretlab.ca, jaswinder.singh@linaro.org
Subject: Re: [PATCH v5 0/6] spi: s3c64xx: add support for device tree
Date: Thu, 12 Jul 2012 17:16:57 +0100 [thread overview]
Message-ID: <20120712161657.GC7256@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <CAJuYYwS59yoRnyFOR4_M5ymAS5uh0fN5zS=x2CS5Ax-795awBA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 660 bytes --]
On Thu, Jul 12, 2012 at 07:13:37PM +0530, Thomas Abraham wrote:
> On 12 July 2012 18:32, Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
> > Well, simple conflicts aren't that big a deal... However, Thomas
> > mentioned that in order to test this he merged the SPI tree into your
> > tree so perhaps there is also a dependency on the SPI tree? If that was
> > just for good practice testing then I agree that the best thing is to
> > merge via your tree, otherwise we might need to think harder.
> There were no dependency on Grant's spi/next branch. It was merged
> just to ensure that nothing is broken.
OK, great - then the Samsung tree it is.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 0/6] spi: s3c64xx: add support for device tree
Date: Thu, 12 Jul 2012 17:16:57 +0100 [thread overview]
Message-ID: <20120712161657.GC7256@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <CAJuYYwS59yoRnyFOR4_M5ymAS5uh0fN5zS=x2CS5Ax-795awBA@mail.gmail.com>
On Thu, Jul 12, 2012 at 07:13:37PM +0530, Thomas Abraham wrote:
> On 12 July 2012 18:32, Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
> > Well, simple conflicts aren't that big a deal... However, Thomas
> > mentioned that in order to test this he merged the SPI tree into your
> > tree so perhaps there is also a dependency on the SPI tree? If that was
> > just for good practice testing then I agree that the best thing is to
> > merge via your tree, otherwise we might need to think harder.
> There were no dependency on Grant's spi/next branch. It was merged
> just to ensure that nothing is broken.
OK, great - then the Samsung tree it is.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120712/d20848c7/attachment.sig>
next prev parent reply other threads:[~2012-07-12 16:16 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 15:40 [PATCH v5 0/6] spi: s3c64xx: add support for device tree Thomas Abraham
2012-07-11 15:40 ` Thomas Abraham
2012-07-11 15:41 ` [PATCH v5 1/6] spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro Thomas Abraham
2012-07-11 15:41 ` Thomas Abraham
2012-07-11 15:41 ` [PATCH v5 2/6] spi: s3c64xx: move controller information into driver data Thomas Abraham
2012-07-11 15:41 ` Thomas Abraham
2012-07-11 15:41 ` [PATCH v5 3/6] ARM: Samsung: Remove pdev pointer parameter from spi gpio setup functions Thomas Abraham
2012-07-11 15:41 ` Thomas Abraham
2012-07-11 15:41 ` [PATCH v5 4/6] ARM: Samsung: Modify s3c64xx_spi{0|1|2}_set_platdata function Thomas Abraham
2012-07-11 15:41 ` Thomas Abraham
2012-07-11 15:41 ` [PATCH v5 5/6] spi: s3c64xx: Remove the 'set_level' callback from controller data Thomas Abraham
2012-07-11 15:41 ` Thomas Abraham
2012-07-11 15:41 ` [PATCH v5 6/6] spi: s3c64xx: add device tree support Thomas Abraham
2012-07-11 15:41 ` Thomas Abraham
[not found] ` <1342021265-11212-7-git-send-email-thomas.abraham-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2012-07-12 22:38 ` Kukjin Kim
2012-07-12 22:38 ` Kukjin Kim
2012-07-13 3:55 ` Thomas Abraham
2012-07-13 3:55 ` Thomas Abraham
2012-07-13 11:28 ` Kukjin Kim
2012-07-13 11:28 ` Kukjin Kim
2012-07-13 11:38 ` Thomas Abraham
2012-07-13 11:38 ` Thomas Abraham
2012-07-13 13:42 ` Kukjin Kim
2012-07-13 13:42 ` Kukjin Kim
2012-07-13 14:51 ` Thomas Abraham
2012-07-13 14:51 ` Thomas Abraham
2012-07-15 10:39 ` Kukjin Kim
2012-07-15 10:39 ` Kukjin Kim
2012-07-11 17:49 ` [PATCH v5 0/6] spi: s3c64xx: add support for device tree Mark Brown
2012-07-11 17:49 ` Mark Brown
2012-07-11 18:00 ` Thomas Abraham
2012-07-11 18:00 ` Thomas Abraham
2012-07-12 8:47 ` Thomas Abraham
2012-07-12 8:47 ` Thomas Abraham
2012-07-12 9:11 ` Kukjin Kim
2012-07-12 9:11 ` Kukjin Kim
2012-07-12 13:02 ` Mark Brown
2012-07-12 13:02 ` Mark Brown
2012-07-12 13:43 ` Thomas Abraham
2012-07-12 13:43 ` Thomas Abraham
2012-07-12 16:16 ` Mark Brown [this message]
2012-07-12 16:16 ` Mark Brown
[not found] ` <20120712161657.GC7256-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2012-07-12 22:35 ` Kukjin Kim
2012-07-12 22:35 ` Kukjin Kim
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=20120712161657.GC7256@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jaswinder.singh@linaro.org \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=rob.herring@calxeda.com \
--cc=spi-devel-general@lists.sourceforge.net \
--cc=thomas.abraham@linaro.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.