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, Greg KH <greg@kroah.com>,
linux-kernel@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
linux-next@vger.kernel.org, Michal Nazarewicz <mina86@mina86.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 13 Nov 2012 09:48:29 +0100 [thread overview]
Message-ID: <50A2095D.3020306@atmel.com> (raw)
In-Reply-To: <20121113152029.9bcfc18a4bca8dc53a033a86@canb.auug.org.au>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 11/13/2012 05:20 AM, Stephen Rothwell :
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/configs/stamp9g20_defconfig between commit 77614e025061
> ("arch: Change defconfigs to point to g_mass_storage") from the usb
> tree and commit 2484575268e2 ("arm: at91: drop machine defconfig")
> from the arm-soc tree.
>
> The latter deleted the file so I did that and can carry the fix as
> necessary (no action is required).
Yes. Thanks a lot Stephen.
Best regards,
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/
iQEcBAEBAgAGBQJQogldAAoJEAf03oE53VmQqTgIAKUtqhwnXt8Rm1x+ERPiPLno
VhFc1ZPgiPUepSecHMFPCcWtgwLBg6HUFXg4muM7kpf1hvMtAB6CmpasjceV8g0N
KMFC4GrRi6y0dp59DpBUa1gB87i4gpliqmroO3YGu8iGDHGowDBV8HsfmNpLmGTJ
WmdjDzpWE3hfLjNl5F0qnkI1cqDAyWrQwE9cNIFpzY93GfKkVTjdxiKIf6PprJl8
SIicUbeHV/lrNyusEZw0CcNa89qtKCovdBN7Yk64xwyyTnLprxq/Sr30WaFx4npf
A6vdUeCsKL3glD67rD7MUYXZ5KS0pLOuxIVJvvlugbOCwrNDPrZd6NZhqFkgMh8=
=Fpq2
-----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 usb tree
Date: Tue, 13 Nov 2012 09:48:29 +0100 [thread overview]
Message-ID: <50A2095D.3020306@atmel.com> (raw)
In-Reply-To: <20121113152029.9bcfc18a4bca8dc53a033a86@canb.auug.org.au>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 11/13/2012 05:20 AM, Stephen Rothwell :
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/configs/stamp9g20_defconfig between commit 77614e025061
> ("arch: Change defconfigs to point to g_mass_storage") from the usb
> tree and commit 2484575268e2 ("arm: at91: drop machine defconfig")
> from the arm-soc tree.
>
> The latter deleted the file so I did that and can carry the fix as
> necessary (no action is required).
Yes. Thanks a lot Stephen.
Best regards,
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/
iQEcBAEBAgAGBQJQogldAAoJEAf03oE53VmQqTgIAKUtqhwnXt8Rm1x+ERPiPLno
VhFc1ZPgiPUepSecHMFPCcWtgwLBg6HUFXg4muM7kpf1hvMtAB6CmpasjceV8g0N
KMFC4GrRi6y0dp59DpBUa1gB87i4gpliqmroO3YGu8iGDHGowDBV8HsfmNpLmGTJ
WmdjDzpWE3hfLjNl5F0qnkI1cqDAyWrQwE9cNIFpzY93GfKkVTjdxiKIf6PprJl8
SIicUbeHV/lrNyusEZw0CcNa89qtKCovdBN7Yk64xwyyTnLprxq/Sr30WaFx4npf
A6vdUeCsKL3glD67rD7MUYXZ5KS0pLOuxIVJvvlugbOCwrNDPrZd6NZhqFkgMh8=
=Fpq2
-----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>, Greg KH <greg@kroah.com>,
<linux-kernel@vger.kernel.org>, Felipe Balbi <balbi@ti.com>,
<linux-next@vger.kernel.org>,
Michal Nazarewicz <mina86@mina86.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 13 Nov 2012 09:48:29 +0100 [thread overview]
Message-ID: <50A2095D.3020306@atmel.com> (raw)
In-Reply-To: <20121113152029.9bcfc18a4bca8dc53a033a86@canb.auug.org.au>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 11/13/2012 05:20 AM, Stephen Rothwell :
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/configs/stamp9g20_defconfig between commit 77614e025061
> ("arch: Change defconfigs to point to g_mass_storage") from the usb
> tree and commit 2484575268e2 ("arm: at91: drop machine defconfig")
> from the arm-soc tree.
>
> The latter deleted the file so I did that and can carry the fix as
> necessary (no action is required).
Yes. Thanks a lot Stephen.
Best regards,
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/
iQEcBAEBAgAGBQJQogldAAoJEAf03oE53VmQqTgIAKUtqhwnXt8Rm1x+ERPiPLno
VhFc1ZPgiPUepSecHMFPCcWtgwLBg6HUFXg4muM7kpf1hvMtAB6CmpasjceV8g0N
KMFC4GrRi6y0dp59DpBUa1gB87i4gpliqmroO3YGu8iGDHGowDBV8HsfmNpLmGTJ
WmdjDzpWE3hfLjNl5F0qnkI1cqDAyWrQwE9cNIFpzY93GfKkVTjdxiKIf6PprJl8
SIicUbeHV/lrNyusEZw0CcNa89qtKCovdBN7Yk64xwyyTnLprxq/Sr30WaFx4npf
A6vdUeCsKL3glD67rD7MUYXZ5KS0pLOuxIVJvvlugbOCwrNDPrZd6NZhqFkgMh8=
=Fpq2
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2012-11-13 8:48 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-13 4:20 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
2012-11-13 4:20 ` Stephen Rothwell
2012-11-13 4:20 ` Stephen Rothwell
2012-11-13 8:48 ` Nicolas Ferre [this message]
2012-11-13 8:48 ` Nicolas Ferre
2012-11-13 8:48 ` Nicolas Ferre
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 6:45 Stephen Rothwell
2013-08-28 6:45 ` Stephen Rothwell
2013-08-28 6:45 ` Stephen Rothwell
2013-08-28 17:26 ` Greg KH
2013-08-28 17:26 ` Greg KH
2013-08-27 8:24 Stephen Rothwell
2013-08-27 8:24 ` Stephen Rothwell
2013-08-27 8:24 ` Stephen Rothwell
2013-08-27 8:21 Stephen Rothwell
2013-08-27 8:21 ` Stephen Rothwell
2013-08-27 8:21 ` Stephen Rothwell
2013-08-27 8:18 Stephen Rothwell
2013-08-27 8:18 ` Stephen Rothwell
2013-08-27 8:18 ` Stephen Rothwell
2013-08-27 8:13 Stephen Rothwell
2013-08-27 8:13 ` Stephen Rothwell
2013-08-27 8:13 ` Stephen Rothwell
2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 17:37 ` Greg KH
2013-08-27 17:37 ` Greg KH
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 19:30 ` Greg KH
2013-08-27 19:30 ` Greg KH
2013-08-27 19:56 ` Felipe Balbi
2013-08-27 19:56 ` Felipe Balbi
2013-08-27 19:56 ` Felipe Balbi
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:47 ` Benoit Cousson
2013-08-29 14:47 ` Benoit Cousson
2013-08-27 19:23 ` Sebastian Andrzej Siewior
2013-08-27 19:23 ` Sebastian Andrzej Siewior
2013-08-27 15:01 ` Kevin Hilman
2013-08-27 15:01 ` Kevin Hilman
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-28 13:01 ` Benoit Cousson
2013-08-28 13:01 ` Benoit Cousson
2013-08-27 16:20 ` Kevin Hilman
2013-08-27 16:20 ` Kevin Hilman
2013-06-18 6:12 Stephen Rothwell
2013-06-18 6:12 ` Stephen Rothwell
2013-06-18 6:12 ` Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
2013-06-18 16:03 ` Greg KH
2013-02-12 3:59 Stephen Rothwell
2013-02-12 3:59 ` Stephen Rothwell
2013-02-12 3:59 ` Stephen Rothwell
2013-02-11 6:06 Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 6:05 Stephen Rothwell
2013-02-11 6:05 ` Stephen Rothwell
2013-02-11 6:05 ` Stephen Rothwell
2012-11-27 4:57 Stephen Rothwell
2012-11-27 4:57 ` Stephen Rothwell
2012-11-27 4:57 ` Stephen Rothwell
2012-11-27 8:37 ` Arnd Bergmann
2012-11-27 8:37 ` Arnd Bergmann
2012-11-13 4:06 Stephen Rothwell
2012-11-13 4:06 ` Stephen Rothwell
2012-11-13 4:06 ` Stephen Rothwell
2012-11-13 8:47 ` Nicolas Ferre
2012-11-13 8:47 ` Nicolas Ferre
2012-11-13 8:47 ` Nicolas Ferre
2012-09-25 6:56 Stephen Rothwell
2012-09-25 6:56 ` Stephen Rothwell
2012-09-25 6:56 ` Stephen Rothwell
2012-09-25 7:22 ` Tony Prisk
2012-09-25 7:22 ` Tony Prisk
2012-09-06 5:42 Stephen Rothwell
2012-09-06 5:42 ` Stephen Rothwell
2012-09-06 5:42 ` Stephen Rothwell
2012-09-06 9:32 ` Roland Stigge
2012-09-06 9:32 ` Roland Stigge
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=50A2095D.3020306@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mina86@mina86.com \
--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.