From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Koul, Vinod" <vinod.koul@intel.com>, "hch@lst.de" <hch@lst.de>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"andriy.shevchenko@linux.intel.com"
<andriy.shevchenko@linux.intel.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the slave-dma tree
Date: Thu, 15 Oct 2015 16:07:51 +0200 [thread overview]
Message-ID: <5852722.yfOrjUKMax@wuerfel> (raw)
In-Reply-To: <20151015145142.54e537a4@canb.auug.org.au>
On Thursday 15 October 2015 14:51:42 Stephen Rothwell wrote:
> Hi Vinod,
>
> On Thu, 15 Oct 2015 03:35:42 +0000 "Koul, Vinod" <vinod.koul@intel.com> wrote:
> >
> > So should I ask Linus to apply this fix once merge window opens or you will send
> > this, how do we go about fixing this one
> >
> > Or should I merge the above commit from asm-generic tree?
>
> Up to you. Though you should only merge fro mthe asm-generic tree if
> the maintainer guarantees it will not be rebased.
>
> You could just wait and tell Linus that this fixup is needed when the
> two trees are merged. It really need to go into the merge commit to
> avoid bisection problems.
>
I've added a workaround to the asm-generic tree, no need to worry about
it for now. We can change over the remaining users of
asm-generic/io-64-nonatomic-lo-hi.h for the following merge window and
then remove the wrapper.
Arnd
next prev parent reply other threads:[~2015-10-15 14:08 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 0:51 linux-next: build failure after merge of the slave-dma tree Stephen Rothwell
2015-10-15 3:35 ` Koul, Vinod
2015-10-15 3:35 ` Koul, Vinod
2015-10-15 3:51 ` Stephen Rothwell
2015-10-15 14:07 ` Arnd Bergmann [this message]
2015-10-15 14:27 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-07-04 7:31 Stephen Rothwell
2019-07-06 13:43 ` Robin Gong
2019-07-06 14:43 ` Vinod Koul
2019-07-08 2:01 ` Robin Gong
2019-07-08 4:09 ` Vinod Koul
2019-07-08 1:22 ` Robin Gong
2019-07-08 3:06 ` zhangfei
2019-07-08 4:17 ` Vinod Koul
2019-07-08 4:54 ` Robin Gong
2019-07-08 4:48 ` Robin Gong
2018-10-04 5:44 Stephen Rothwell
2018-10-04 6:13 ` Vinod
2017-08-22 5:36 Stephen Rothwell
2017-08-22 16:39 ` Vinod Koul
2016-09-16 3:18 Stephen Rothwell
2016-09-16 8:34 ` Peter Griffin
2016-09-19 16:38 ` Vinod Koul
2015-08-06 2:22 Stephen Rothwell
2015-08-06 3:00 ` Vinod Koul
2015-08-24 6:53 ` Maxime Ripard
2015-08-24 8:11 ` Vinod Koul
2015-08-24 9:21 ` Maxime Ripard
2015-02-16 1:09 Stephen Rothwell
2015-02-16 1:48 ` Yibin Gong
2015-02-16 1:48 ` Yibin Gong
2015-02-16 4:06 ` Vinod Koul
2014-12-09 3:48 Stephen Rothwell
2014-12-09 4:47 ` Vinod Koul
2014-11-10 0:58 Stephen Rothwell
2014-11-10 5:06 ` Vinod Koul
2014-11-12 13:23 ` Ludovic Desroches
2014-11-12 13:23 ` Ludovic Desroches
2014-09-12 3:17 Stephen Rothwell
2014-09-15 9:51 ` Geert Uytterhoeven
2014-07-28 2:18 Stephen Rothwell
2014-07-28 7:16 ` Vinod Koul
2014-07-28 11:56 ` Maxime Ripard
2013-04-02 1:57 Stephen Rothwell
2013-04-02 1:38 ` Vinod Koul
2013-01-07 0:26 Stephen Rothwell
2013-01-07 14:00 ` Vinod Koul
2012-06-22 3:00 Stephen Rothwell
2012-06-22 5:01 ` Vinod Koul
2012-06-25 1:21 ` Zhangfei Gao
2012-03-27 0:52 Stephen Rothwell
2012-03-27 8:33 ` Vinod Koul
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=5852722.yfOrjUKMax@wuerfel \
--to=arnd@arndb.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@intel.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.