Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1247277 > unrolled thread

linux-next: build failure after merge of the slave-dma tree

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2015-10-15 03:00 +0200
Last post2015-10-15 16:30 +0200
Articles 5 — 3 participants

Back to article view | Back to linux.kernel

Contents

  linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 03:00 +0200
    Re: linux-next: build failure after merge of the slave-dma tree "Koul, Vinod" <vinod.koul@intel.com> - 2015-10-15 05:40 +0200
      Re: linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 06:00 +0200
        Re: linux-next: build failure after merge of the slave-dma tree Arnd Bergmann <arnd@arndb.de> - 2015-10-15 16:10 +0200
          Re: linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 16:30 +0200

#1247277 — linux-next: build failure after merge of the slave-dma tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-10-15 03:00 +0200
Subjectlinux-next: build failure after merge of the slave-dma tree
Message-ID<qjF3H-7eR-3@gated-at.bofh.it>
Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/idma64.h:19:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory
 #include <asm-generic/io-64-nonatomic-lo-hi.h>
                                               ^

Caused by commit

  97c37accd38f ("dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq()")

interacting with commit

  f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")

from the asm-generic tree.

I have applied the folling merge fix patch and can carry it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Oct 2015 11:47:07 +1100
Subject: [PATCH] dmaengine: idma64: merge fix for "move io-64-nonatomic*.h out of asm-generic"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/dma/idma64.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h
index f6aeff0af8a5..801d5462d663 100644
--- a/drivers/dma/idma64.h
+++ b/drivers/dma/idma64.h
@@ -15,8 +15,7 @@
 #include <linux/io.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
-
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
 
 #include "virt-dma.h"
 
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1247374

From"Koul, Vinod" <vinod.koul@intel.com>
Date2015-10-15 05:40 +0200
Message-ID<qjHyx-2yL-7@gated-at.bofh.it>
In reply to#1247277
T24gVGh1LCAyMDE1LTEwLTE1IGF0IDExOjUxICsxMTAwLCBTdGVwaGVuIFJvdGh3ZWxsIHdyb3Rl
Og0KPiBIaSBWaW5vZCwNCj4gDQo+IEFmdGVyIG1lcmdpbmcgdGhlIHNsYXZlLWRtYSB0cmVlLCB0
b2RheSdzIGxpbnV4LW5leHQgYnVpbGQgKHg4Nl82NA0KPiBhbGxtb2Rjb25maWcpIGZhaWxlZCBs
aWtlIHRoaXM6DQo+IA0KPiBkcml2ZXJzL2RtYS9pZG1hNjQuaDoxOTo0NzogZmF0YWwgZXJyb3I6
IGFzbS1nZW5lcmljL2lvLTY0LW5vbmF0b21pYy1sby1oaS5oOiBObw0KPiBzdWNoIGZpbGUgb3Ig
ZGlyZWN0b3J5DQo+ICAjaW5jbHVkZSA8YXNtLWdlbmVyaWMvaW8tNjQtbm9uYXRvbWljLWxvLWhp
Lmg+DQo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXg0K
PiANCj4gQ2F1c2VkIGJ5IGNvbW1pdA0KPiANCj4gICA5N2MzN2FjY2QzOGYgKCJkbWFlbmdpbmU6
IGlkbWE2NDogdXNlIGxvX2hpX3JlYWRxKCkgLyBsb19oaV93cml0ZXEoKSIpDQo+IA0KPiBpbnRl
cmFjdGluZyB3aXRoIGNvbW1pdA0KPiANCj4gICBmNjI2ZmUxNzQ4NWIgKCJtb3ZlIGlvLTY0LW5v
bmF0b21pYyouaCBvdXQgb2YgYXNtLWdlbmVyaWMiKQ0KPiANCj4gZnJvbSB0aGUgYXNtLWdlbmVy
aWMgdHJlZS4NCj4gDQo+IEkgaGF2ZSBhcHBsaWVkIHRoZSBmb2xsaW5nIG1lcmdlIGZpeCBwYXRj
aCBhbmQgY2FuIGNhcnJ5IGl0IGFzIG5lY2Vzc2FyeS4NCg0KVGhhbmtzIFN0ZXBoZW4sIFRoaXMg
bG9va3MgZmluZSB0byBtZS4NCg0KU28gc2hvdWxkIEkgYXNrIExpbnVzIHRvIGFwcGx5IHRoaXMg
Zml4IG9uY2UgbWVyZ2Ugd2luZG93IG9wZW5zIG9yIHlvdSB3aWxsIHNlbmQNCnRoaXMsIGhvdyBk
byB3ZSBnbyBhYm91dCBmaXhpbmcgdGhpcyBvbmUgOikNCg0KT3Igc2hvdWxkIEkgbWVyZ2UgdGhl
IGFib3ZlIGNvbW1pdCBmcm9tIGFzbS1nZW5lcmljIHRyZWU/DQoNCi0tIA0KflZpbm9kDQo=
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1247381

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-10-15 06:00 +0200
Message-ID<qjHRT-2W8-7@gated-at.bofh.it>
In reply to#1247374
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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1247822

FromArnd Bergmann <arnd@arndb.de>
Date2015-10-15 16:10 +0200
Message-ID<qjRof-dR-37@gated-at.bofh.it>
In reply to#1247381
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1247845

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2015-10-15 16:30 +0200
Message-ID<qjRHA-AM-17@gated-at.bofh.it>
In reply to#1247822
Hi Arnd,

On Thu, 15 Oct 2015 16:07:51 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> 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.

Thanks.  I have dropped my merge fix patches as well.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web