From: Jonas Bonn <jonas@southpole.se>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm tree with the openrisc tree
Date: Mon, 18 Jul 2011 13:02:55 +0200 [thread overview]
Message-ID: <1310986975.21015.13.camel@needafix> (raw)
In-Reply-To: <20110718185608.97377aa900b014aa010830a2@canb.auug.org.au>
On Mon, 2011-07-18 at 18:56 +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got a conflict in
> arch/x86/include/asm/delay.h between commit 10f53642f115 ("asm-generic:
> move archictures to common delay.h") from the openrisc tree and commit
> "With a non-constant 8-bit argument, a call to udelay() generates a
> warning:" from the akpm tree.
>
> I just dropped this patch from the akpm tree as the former commit
> consolidated this code into asm-generic/delay.h (which doesn't solve the
> problem).
Applying the change from Andrew's patch to asm-generic/delay.h looks
like the sane thing to do. I can do that in my tree and then Andrew can
drop the patch from his tree... does that sound reasonable?
Just so others don't have to go digging for it, the patch in question
is:
http://userweb.kernel.org/~akpm/mmotm/broken-out/arch-x86-include-asm-delayh-fix-udelay-and-ndelay-for-8-bit-args.patch
/Jonas
next parent reply other threads:[~2011-07-18 11:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110718185608.97377aa900b014aa010830a2@canb.auug.org.au>
2011-07-18 11:02 ` Jonas Bonn [this message]
2011-07-18 11:02 ` linux-next: manual merge of the akpm tree with the openrisc tree Jonas Bonn
2011-07-18 14:05 ` [PATCH 1/1] asm-generic: delay.h fix udelay and ndelay for 8 bit args Jonas Bonn
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=1310986975.21015.13.camel@needafix \
--to=jonas@southpole.se \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).