From: Jonas Bonn <jonas@southpole.se>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: sfr@canb.auug.org.au, Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
arnd@arndb.de
Subject: Re: [PATCH 1/1] asm-generic: delay.h fix udelay and ndelay for 8 bit args
Date: Fri, 22 Jul 2011 21:17:05 +0200 [thread overview]
Message-ID: <1311362225.2660.18.camel@localhost> (raw)
In-Reply-To: <4E29CB4A.40508@zytor.com>
On Fri, 2011-07-22 at 12:11 -0700, H. Peter Anvin wrote:
> On 07/22/2011 12:04 PM, Jonas Bonn wrote:
> >
> > On Mon, 2011-07-18 at 16:05 +0200, Jonas Bonn wrote:
> >> From: Andrew Morton <akpm@linux-foundation.org>
> >>
> >> With a non-constant 8-bit argument, a call to udelay() generates a warning:
> >>
> > <snip>
> >
> >> ---
> >>
> >> Here's a patch that should resolve the merge conflict. This applies
> >> Andrew's changes on top of the new asm-generic/delay.h instead of the x86
> >> arch-specific one. I've tested this for OpenRISC and the changed macros
> >> don't cause any problems there.
> >>
> >> Let me know if this is OK and I'll throw it into the OpenRISC tree together
> >> with the other delay.h modifications.
> >>
> >
> > I haven't gotten any feedback on this... since the change looks
> > appropriate to merge with the other changes to asm-generic/delay.h, I'll
> > apply this patch there and carry the patch together with the other
> > asm-generic/delay.h changes in the 'openrisc' tree. Andrew can drop the
> > patch from his series to avoid the merge conflict.
> >
> > I hope that works for everybody...
> >
>
> You may want to Cc: Arnd on this, since he's the asm-generic maintainer.
>
> Otherwise, since this is zero work on our part, it obviously works for me.
>
Good idea!
CC:ing Arnd, too...
Arnd has already reviewed the changes to delay.h. This is only about
getting Andrew's fixes out of his tree where they cause a merge conflict
and into asm-generic/delay.h where they belong.
Thanks,
Jonas
prev parent reply other threads:[~2011-07-22 19:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 8:56 linux-next: manual merge of the akpm tree with the openrisc tree Stephen Rothwell
2011-07-18 11:02 ` Jonas Bonn
2011-07-18 14:05 ` [PATCH 1/1] asm-generic: delay.h fix udelay and ndelay for 8 bit args Jonas Bonn
2011-07-22 19:04 ` Jonas Bonn
2011-07-22 19:11 ` H. Peter Anvin
2011-07-22 19:17 ` Jonas Bonn [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=1311362225.2660.18.camel@localhost \
--to=jonas@southpole.se \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).