From: Christoph Hellwig <hch@lst.de>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Lee Jones <lee.jones@linaro.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the mfd tree
Date: Thu, 15 Oct 2015 14:04:07 +0200 [thread overview]
Message-ID: <20151015120407.GA31945@lst.de> (raw)
In-Reply-To: <7853704.H00KElTCBt@wuerfel>
On Thu, Oct 15, 2015 at 10:59:32AM +0200, Arnd Bergmann wrote:
> The patch looks good, should we do something to prevent that from
> becoming a problem when Linus pulls our branches?
>
> This commit is at the bottom of my asm-generic git tree, so Lee could merge
> that one commit into his tree and fix up the merge correctly.
>
> However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
> has the same problem, so maybe it's better to add a temporary file
> with the old name containing "#include <linux/io-64-nonatomic-lo-hi.h>",
> which I will remove in the following merge window or as a follow-up.
I guess we really need that. Do you want to do a quick fixup or should I send
a patch?
next prev parent reply other threads:[~2015-10-15 12:04 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 2:26 linux-next: build failure after merge of the mfd tree Stephen Rothwell
2015-10-15 3:35 ` kbuild test robot
2015-10-15 8:59 ` Arnd Bergmann
2015-10-15 9:17 ` Lee Jones
2015-10-15 9:45 ` Andy Shevchenko
2015-10-15 12:04 ` Christoph Hellwig [this message]
2015-10-15 12:28 ` Arnd Bergmann
2015-10-16 1:27 ` Stephen Rothwell
2015-10-16 10:10 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 2:00 Stephen Rothwell
2023-04-06 7:36 ` Lee Jones
2023-04-06 17:22 ` Mark Brown
2023-03-31 1:15 Stephen Rothwell
2022-07-05 1:54 Stephen Rothwell
2022-07-05 12:32 ` Lee Jones
2022-07-05 14:26 ` Aidan MacDonald
2022-02-23 16:54 broonie
2022-02-23 17:03 ` Lee Jones
2022-02-28 6:08 ` Stephen Rothwell
2022-02-28 8:17 ` Lee Jones
2020-11-05 1:47 [PATCH 1/5] gpio: tps65910: use regmap accessors Michał Mirosław
2020-11-05 1:50 ` linux-next: build failure after merge of the mfd tree Stephen Rothwell
2020-11-05 1:57 ` Michał Mirosław
2020-11-05 9:09 ` Lee Jones
2020-07-17 3:41 Stephen Rothwell
2020-07-17 6:56 ` Lee Jones
2020-07-17 6:59 ` Stephen Rothwell
2020-07-17 7:11 ` Lee Jones
2020-02-04 3:03 Stephen Rothwell
2020-02-04 7:53 ` Lee Jones
2020-02-04 10:04 ` Srinivas Kandagatla
2019-04-03 0:40 Stephen Rothwell
2018-12-17 5:38 Stephen Rothwell
2017-12-04 3:19 Stephen Rothwell
2017-12-04 9:10 ` Greg KH
2017-12-04 9:39 ` Lee Jones
2017-12-05 23:32 ` Stephen Rothwell
2017-12-06 8:58 ` Lee Jones
2017-12-12 2:13 ` Stephen Rothwell
2017-12-12 8:13 ` Lee Jones
2017-12-12 11:54 ` Stephen Rothwell
2017-05-31 2:23 Stephen Rothwell
2017-05-31 3:36 ` Stephen Rothwell
2017-06-05 3:28 ` Stephen Rothwell
2017-04-04 6:44 Stephen Rothwell
2017-04-04 8:19 ` Lee Jones
2017-04-04 8:21 ` Lee Jones
2017-04-04 12:31 ` Andy Shevchenko
2017-04-10 2:11 ` Stephen Rothwell
2017-04-10 6:55 ` Lee Jones
2017-04-10 7:53 ` Stephen Rothwell
2016-02-29 3:51 Stephen Rothwell
2016-03-01 1:19 ` Kuninori Morimoto
2016-03-01 1:35 ` Kuninori Morimoto
2016-03-02 4:00 ` Mark Brown
2015-03-04 0:34 Stephen Rothwell
2015-03-04 0:37 ` Stephen Rothwell
2015-03-04 7:26 ` Sascha Hauer
2014-11-11 2:32 Stephen Rothwell
2014-11-04 5:40 Stephen Rothwell
2014-11-04 7:54 ` Krzysztof Kozlowski
2014-11-04 8:09 ` Lee Jones
2014-08-22 16:56 Stephen Rothwell
2014-08-22 19:09 ` Lee Jones
2013-04-08 4:21 Stephen Rothwell
2013-04-08 4:45 ` Alexander Shiyan
2013-04-08 9:22 ` Samuel Ortiz
2013-04-08 16:27 ` Re[2]: " Alexander Shiyan
2013-04-09 7:20 ` Samuel Ortiz
2013-04-09 15:47 ` Re[2]: " Alexander Shiyan
2013-04-09 16:12 ` Samuel Ortiz
2013-04-09 16:50 ` Rob Herring
2013-04-09 20:51 ` Samuel Ortiz
2012-09-25 3:47 Stephen Rothwell
2012-09-25 6:47 ` Matthias Kaehlcke
2012-09-25 8:43 ` Samuel Ortiz
2012-07-09 3:57 Stephen Rothwell
2012-07-09 10:52 ` Samuel Ortiz
2012-07-10 9:20 ` Samuel Ortiz
2012-05-21 3:42 Stephen Rothwell
2012-05-21 8:08 ` Lee Jones
2012-05-21 8:40 ` Stephen Rothwell
2012-05-21 9:01 ` Lee Jones
2012-05-21 9:10 ` Stephen Rothwell
2012-05-21 9:19 ` Lee Jones
2012-05-21 9:54 ` Mark Brown
2012-05-21 10:28 ` Lee Jones
2012-05-22 22:42 ` Samuel Ortiz
2012-05-22 22:52 ` Stephen Rothwell
2012-05-23 14:34 ` Samuel Ortiz
2012-05-21 8:30 ` Lee Jones
2012-05-21 9:07 ` Stephen Rothwell
2012-05-16 6:09 Stephen Rothwell
2012-05-18 8:39 ` Samuel Ortiz
2012-05-14 3:37 Stephen Rothwell
2012-05-14 20:22 ` Samuel Ortiz
2012-03-19 2:13 Stephen Rothwell
2012-03-19 6:19 ` Laxman Dewangan
2012-03-20 12:40 ` Samuel Ortiz
2012-02-21 1:31 Stephen Rothwell
2012-02-21 11:32 ` Samuel Ortiz
2011-12-20 3:17 Stephen Rothwell
2011-12-20 17:37 ` Samuel Ortiz
2011-09-19 6:19 Stephen Rothwell
2011-09-19 9:43 ` Samuel Ortiz
2011-09-16 3:55 Stephen Rothwell
2011-09-16 7:16 ` Uwe Kleine-König
2011-09-16 8:39 ` Stephen Rothwell
2011-09-18 17:15 ` Samuel Ortiz
2011-06-21 3:03 Stephen Rothwell
2011-06-21 10:07 ` Mark Brown
2011-06-21 17:58 ` Samuel Ortiz
2011-02-22 3:20 Stephen Rothwell
2011-02-22 9:21 ` Samuel Ortiz
2010-09-16 2:54 Stephen Rothwell
2010-09-19 22:27 ` Samuel Ortiz
2010-08-09 1:40 Stephen Rothwell
2010-08-09 8:51 ` Mike Rapoport
2010-08-09 9:10 ` Samuel Ortiz
2010-05-19 4:03 Stephen Rothwell
2010-05-19 4:23 ` Rabin VINCENT
2010-05-19 9:57 ` Samuel Ortiz
2010-05-19 14:14 ` Stephen Rothwell
2010-04-08 2:57 Stephen Rothwell
2010-04-08 9:33 ` Samuel Ortiz
2010-04-07 5:02 Stephen Rothwell
2010-04-07 8:53 ` Samuel Ortiz
2010-04-07 16:24 ` Stephen Rothwell
2010-04-07 4:51 Stephen Rothwell
2010-04-07 8:52 ` Samuel Ortiz
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=20151015120407.GA31945@lst.de \
--to=hch@lst.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=lee.jones@linaro.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).