From: Arnd Bergmann <arnd@arndb.de>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: bad merge in "Merge branch 'rmobile-fixes-for-linus'" ?
Date: Sat, 24 Mar 2012 18:28:00 +0000 [thread overview]
Message-ID: <201203241828.00436.arnd@arndb.de> (raw)
In-Reply-To: <20120324173732.GA7509@windriver.com>
On Saturday 24 March 2012, Paul Gortmaker wrote:
> Hi Arnd,
>
> I fed this failure to git bisect:
>
> arch/arm/mach-shmobile/setup-sh7372.c:63:2: error: implicit declaration
> of function 'init_consistent_dma_size'
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/5941296/
>
> and it came back with your merge below. Can you have a look and see if
> that makes sense?
>
Thanks a lot for the report, this was indeed my mistake when merging
the patch. Fixed now.
Arnd
prev parent reply other threads:[~2012-03-24 18:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-24 17:37 linux-next: bad merge in "Merge branch 'rmobile-fixes-for-linus'" ? Paul Gortmaker
2012-03-24 18:28 ` Arnd Bergmann [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=201203241828.00436.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-next@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
/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.