From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: olof@lixom.net, torvalds@linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org
Subject: Re: [PATCH] net: stmmac: fix bad merge conflict resolution
Date: Fri, 6 Sep 2013 14:19:29 +1000 [thread overview]
Message-ID: <20130906141929.2f30c62de4eb5c6ad9d3f699@canb.auug.org.au> (raw)
In-Reply-To: <20130905.225817.700066425182547791.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 696 bytes --]
Hi all,
On Thu, 05 Sep 2013 22:58:17 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Olof Johansson <olof@lixom.net>
> Date: Thu, 5 Sep 2013 18:01:41 -0700
>
> > Merge commit 06c54055bebf919249aa1eb68312887c3cfe77b4 did a bad conflict
> > resolution accidentally leaving out a closing brace. Add it back.
> >
> > Signed-off-by: Olof Johansson <olof@lixom.net>
> > ---
> >
> > This breaks a handful of defconfigs on ARM, so it'd be good to see it
> > applied pretty quickly. Thanks!
>
> Looks like Linus applied this, thanks Olof.
And I cherry-picked it into linux-next for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-09-06 4:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 20:37 [GIT] Networking David Miller
2013-09-06 1:01 ` [PATCH] net: stmmac: fix bad merge conflict resolution Olof Johansson
2013-09-06 2:58 ` David Miller
2013-09-06 4:19 ` Stephen Rothwell [this message]
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=20130906141929.2f30c62de4eb5c6ad9d3f699@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®