Re: linux-next: manual merge of the arm-soc tree with the pinctrl tree

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Nicolas Ferre <nicolas.ferre@atmel.com>
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,
	Linus Walleij <linus.walleij@linaro.org>,
	linux-next@vger.kernel.org,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
	linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the pinctrl tree
Date: Tue, 13 Nov 2012 09:51:33 +0100	[thread overview]
Message-ID: <50A20A15.6090506@atmel.com> (raw)
In-Reply-To: <20121113151754.98aa6471baaf062826c3b133@canb.auug.org.au>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/13/2012 05:17 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 784557decc48
> ("tty: atmel_serial: add pinctrl support") from the pinctrl tree
> and commit bcd2360c1ff9 ("arm: at91: move platfarm_data to 
> include/linux/platform_data/atmel.h") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Stephen, it is the proper merge.

Thanks a lot.

Best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQogoUAAoJEAf03oE53VmQAt0H/iThKsKe+ag10z9Q8xlO6sqR
dvfFtRQxv7W1xVeRc/RJjnE/thKaa+FMiUfvFoj4Gls6UZD3vAvwatI+kkGY30yp
FbflguygU8OvAQcr/dpVx2tBzsqCk7Xynk+D0+DjlJXukP+JzP+3/tl7Gd0/lct7
nLccb1X0sNwTrvlLJO2WJuOGwFlTU3vO1wkehgic2ozfm3FzsaTLUjkUf6YXOG1N
BoABfHJL0PyNk6iENu26j6ulDPaWrpJe5531hTcJm16X+h2gnmnnjpYw9dTTQ5qO
La0UeqkqTxEUOFmo3cxbS0ryBeQBTmHss61JLVcqnlwApTscefmD4x8G310D7oA=
=mEy6
-----END PGP SIGNATURE-----

WARNING: multiple messages have this Message-ID (diff)

From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the pinctrl tree
Date: Tue, 13 Nov 2012 09:51:33 +0100	[thread overview]
Message-ID: <50A20A15.6090506@atmel.com> (raw)
In-Reply-To: <20121113151754.98aa6471baaf062826c3b133@canb.auug.org.au>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/13/2012 05:17 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 784557decc48
> ("tty: atmel_serial: add pinctrl support") from the pinctrl tree
> and commit bcd2360c1ff9 ("arm: at91: move platfarm_data to 
> include/linux/platform_data/atmel.h") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Stephen, it is the proper merge.

Thanks a lot.

Best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQogoUAAoJEAf03oE53VmQAt0H/iThKsKe+ag10z9Q8xlO6sqR
dvfFtRQxv7W1xVeRc/RJjnE/thKaa+FMiUfvFoj4Gls6UZD3vAvwatI+kkGY30yp
FbflguygU8OvAQcr/dpVx2tBzsqCk7Xynk+D0+DjlJXukP+JzP+3/tl7Gd0/lct7
nLccb1X0sNwTrvlLJO2WJuOGwFlTU3vO1wkehgic2ozfm3FzsaTLUjkUf6YXOG1N
BoABfHJL0PyNk6iENu26j6ulDPaWrpJe5531hTcJm16X+h2gnmnnjpYw9dTTQ5qO
La0UeqkqTxEUOFmo3cxbS0ryBeQBTmHss61JLVcqnlwApTscefmD4x8G310D7oA=
=mEy6
-----END PGP SIGNATURE-----

WARNING: multiple messages have this Message-ID (diff)

From: Nicolas Ferre <nicolas.ferre@atmel.com>
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>,
	Linus Walleij <linus.walleij@linaro.org>,
	<linux-next@vger.kernel.org>,
	"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@jcrosoft.com>,
	<linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pinctrl tree
Date: Tue, 13 Nov 2012 09:51:33 +0100	[thread overview]
Message-ID: <50A20A15.6090506@atmel.com> (raw)
In-Reply-To: <20121113151754.98aa6471baaf062826c3b133@canb.auug.org.au>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/13/2012 05:17 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 784557decc48
> ("tty: atmel_serial: add pinctrl support") from the pinctrl tree
> and commit bcd2360c1ff9 ("arm: at91: move platfarm_data to 
> include/linux/platform_data/atmel.h") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Stephen, it is the proper merge.

Thanks a lot.

Best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQogoUAAoJEAf03oE53VmQAt0H/iThKsKe+ag10z9Q8xlO6sqR
dvfFtRQxv7W1xVeRc/RJjnE/thKaa+FMiUfvFoj4Gls6UZD3vAvwatI+kkGY30yp
FbflguygU8OvAQcr/dpVx2tBzsqCk7Xynk+D0+DjlJXukP+JzP+3/tl7Gd0/lct7
nLccb1X0sNwTrvlLJO2WJuOGwFlTU3vO1wkehgic2ozfm3FzsaTLUjkUf6YXOG1N
BoABfHJL0PyNk6iENu26j6ulDPaWrpJe5531hTcJm16X+h2gnmnnjpYw9dTTQ5qO
La0UeqkqTxEUOFmo3cxbS0ryBeQBTmHss61JLVcqnlwApTscefmD4x8G310D7oA=
=mEy6
-----END PGP SIGNATURE-----

next prev parent reply	other threads:[~2012-11-13  8:51 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-13  4:17 linux-next: manual merge of the arm-soc tree with the pinctrl tree Stephen Rothwell
2012-11-13  4:17 ` Stephen Rothwell
2012-11-13  4:17 ` Stephen Rothwell
2012-11-13  8:51 ` Nicolas Ferre [this message]
2012-11-13  8:51   ` Nicolas Ferre
2012-11-13  8:51   ` Nicolas Ferre
  -- strict thread matches above, loose matches on Subject: below --
2013-04-10  7:10 Stephen Rothwell
2013-04-10  7:10 ` Stephen Rothwell
2013-04-10  7:10 ` Stephen Rothwell
2013-01-30 13:36 Stephen Rothwell
2013-01-30 13:36 ` Stephen Rothwell
2013-01-30 13:36 ` Stephen Rothwell
2012-12-21  2:20 Stephen Rothwell
2012-12-21  2:20 ` Stephen Rothwell
2012-12-21  2:20 ` Stephen Rothwell
2012-12-21  3:38 ` Kukjin Kim
2012-12-21  3:38   ` Kukjin Kim
2012-12-26  0:34   ` Linus Walleij
2012-12-26  0:34     ` Linus Walleij
2012-11-26  9:34 Stephen Rothwell
2012-11-26  9:34 ` Stephen Rothwell
2012-11-26  9:34 ` Stephen Rothwell
2012-11-26 10:11 ` Nicolas Ferre
2012-11-26 10:11   ` Nicolas Ferre
2012-11-26 10:11   ` Nicolas Ferre
2012-11-09  2:31 Stephen Rothwell
2012-11-09  2:31 ` Stephen Rothwell
2012-11-09  2:31 ` Stephen Rothwell
2012-11-09 10:10 ` Linus Walleij
2012-11-09 10:10   ` Linus Walleij
2012-10-26  3:27 Stephen Rothwell
2012-10-26  3:27 ` Stephen Rothwell
2012-10-26  3: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=50A20A15.6090506@atmel.com \
    --to=nicolas.ferre@atmel.com \
    --cc=arnd@arndb.de \
    --cc=linus.walleij@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=plagnioj@jcrosoft.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.