All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wolfram Sang <w.sang@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
	Alessandro Rubini <rubini@gnudd.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the i2c-embedded tree
Date: Tue, 10 Jul 2012 10:38:19 +0200	[thread overview]
Message-ID: <20120710083819.GA25197@pengutronix.de> (raw)
In-Reply-To: <20120710164130.f38e4d1673f925ddb13914c9@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]

On Tue, Jul 10, 2012 at 04:41:30PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/i2c/busses/i2c-nomadik.c between commit af97bace2cca
> ("i2c-nomadik: move header to <linux/platform_data/i2c-nomadik.h>") from
> the i2c-embedded tree and commits 32e42c687e0a ("ARM: ux500: Remove
> unused i2c platform_data initialisation code") and 8214fd238a66 ("i2c:
> Add Device Tree support to the Nomadik I2C driver") from the arm-soc tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> Please check this and talk to each other ...

Hmm, I can't recall any discussion that the DT support patch should go
in via arm-soc. Did I miss something? Right now, I'd think it should go
in via i2c. I am fine with the other patch going in via arm-soc, but can
carry it as well.

Regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: w.sang@pengutronix.de (Wolfram Sang)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the i2c-embedded tree
Date: Tue, 10 Jul 2012 10:38:19 +0200	[thread overview]
Message-ID: <20120710083819.GA25197@pengutronix.de> (raw)
In-Reply-To: <20120710164130.f38e4d1673f925ddb13914c9@canb.auug.org.au>

On Tue, Jul 10, 2012 at 04:41:30PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/i2c/busses/i2c-nomadik.c between commit af97bace2cca
> ("i2c-nomadik: move header to <linux/platform_data/i2c-nomadik.h>") from
> the i2c-embedded tree and commits 32e42c687e0a ("ARM: ux500: Remove
> unused i2c platform_data initialisation code") and 8214fd238a66 ("i2c:
> Add Device Tree support to the Nomadik I2C driver") from the arm-soc tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> Please check this and talk to each other ...

Hmm, I can't recall any discussion that the DT support patch should go
in via arm-soc. Did I miss something? Right now, I'd think it should go
in via i2c. I am fine with the other patch going in via arm-soc, but can
carry it as well.

Regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120710/0211c036/attachment.sig>

  parent reply	other threads:[~2012-07-10  8:38 UTC|newest]

Thread overview: 80+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-10  6:41 linux-next: manual merge of the arm-soc tree with the i2c-embedded tree Stephen Rothwell
2012-07-10  6:41 ` Stephen Rothwell
2012-07-10  6:41 ` Stephen Rothwell
2012-07-10  6:50 ` Stephen Rothwell
2012-07-10  6:50   ` Stephen Rothwell
2012-07-10  6:50   ` Stephen Rothwell
2012-07-10  8:38 ` Wolfram Sang [this message]
2012-07-10  8:38   ` Wolfram Sang
2012-07-12 13:12 ` Wolfram Sang
2012-07-12 13:12   ` Wolfram Sang
2012-07-12 15:54   ` Arnd Bergmann
2012-07-12 15:54     ` Arnd Bergmann
2012-07-13 11:03     ` Lee Jones
2012-07-13 11:03       ` Lee Jones
2012-07-14 21:34   ` Linus Walleij
2012-07-14 21:34     ` Linus Walleij
2012-07-14 21:34     ` Linus Walleij
2012-07-16 10:17     ` Wolfram Sang
2012-07-16 10:17       ` Wolfram Sang
2012-07-16 11:31       ` Lee Jones
2012-07-16 11:31         ` Lee Jones
2012-07-16 13:00         ` Wolfram Sang
2012-07-16 13:00           ` Wolfram Sang
2012-07-16 13:55           ` Lee Jones
2012-07-16 13:55             ` Lee Jones
2012-07-17 13:06         ` Mark Brown
2012-07-17 13:06           ` Mark Brown
2012-07-17 13:30           ` Lee Jones
2012-07-17 13:30             ` Lee Jones
2012-07-17 13:35             ` Mark Brown
2012-07-17 13:35               ` Mark Brown
2012-07-17 14:02               ` Lee Jones
2012-07-17 14:02                 ` Lee Jones
2012-07-17 14:22                 ` Mark Brown
2012-07-17 14:22                   ` Mark Brown
2012-07-17 14:52                   ` Lee Jones
2012-07-17 14:52                     ` Lee Jones
2012-07-17 15:20                     ` Mark Brown
2012-07-17 15:20                       ` Mark Brown
2012-07-17 15:20                       ` Mark Brown
2012-07-18  5:33                       ` Shawn Guo
2012-07-18  5:33                         ` Shawn Guo
2012-07-18  5:33                         ` Shawn Guo
2012-07-18  9:59                         ` Mark Brown
2012-07-18  9:59                           ` Mark Brown
2012-07-18 10:29                           ` Lee Jones
2012-07-18 10:29                             ` Lee Jones
2012-07-18 10:33                             ` Mark Brown
2012-07-18 10:33                               ` Mark Brown
2012-07-18 10:43                               ` Lee Jones
2012-07-18 10:43                                 ` Lee Jones
2012-07-18  7:35                       ` Lee Jones
2012-07-18  7:35                         ` Lee Jones
2012-07-18 11:12                         ` Mark Brown
2012-07-18 11:12                           ` Mark Brown
2012-07-18 11:24                           ` Lee Jones
2012-07-18 11:24                             ` Lee Jones
2012-07-16 11:37       ` Linus Walleij
2012-07-16 11:37         ` Linus Walleij
2012-07-16 12:35         ` Wolfram Sang
2012-07-16 12:35           ` Wolfram Sang
2012-07-16 19:45           ` Linus Walleij
2012-07-16 19:45             ` Linus Walleij
2012-07-16 19:45             ` Linus Walleij
2012-07-16 20:04             ` Chris Ball
2012-07-16 20:04               ` Chris Ball
2012-07-16 20:04               ` Chris Ball
2012-07-17 13:10           ` Mark Brown
2012-07-17 13:10             ` Mark Brown
2012-07-19  5:28 Stephen Rothwell
2012-07-19  5:28 ` Stephen Rothwell
2012-07-19  5:28 ` Stephen Rothwell
2012-09-13  6:41 Stephen Rothwell
2012-09-13  6:41 ` Stephen Rothwell
2012-09-13  6:41 ` Stephen Rothwell
2012-09-13  7:09 ` Uwe Kleine-König
2012-09-13  7:09   ` Uwe Kleine-König
2012-11-15  5:27 Stephen Rothwell
2012-11-15  5:27 ` Stephen Rothwell
2012-11-15  5:27 ` Stephen Rothwell

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=20120710083819.GA25197@pengutronix.de \
    --to=w.sang@pengutronix.de \
    --cc=arnd@arndb.de \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=rubini@gnudd.com \
    --cc=sfr@canb.auug.org.au \
    /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.