From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joe Perches <joe@perches.com>
Cc: Doug Ledford <dledford@redhat.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Steve Wise <swise@opengridcomputing.com>
Subject: Re: linux-next: build failure after merge of the rdma tree
Date: Fri, 21 Apr 2017 12:21:54 +1000 [thread overview]
Message-ID: <20170421122154.45e1f0f2@canb.auug.org.au> (raw)
In-Reply-To: <1492739935.30293.20.camel@perches.com>
Hi Joe,
On Thu, 20 Apr 2017 18:58:55 -0700 Joe Perches <joe@perches.com> wrote:
>
> Pretty sure there were crossing commits adding PDBG()
> as the original patches were written against next-20170209
>
> From my tree:
>
> $ git log --pretty=oneline -5 747edc68212781296de30dd2b4e63711240da7a9
> 747edc68212781296de30dd2b4e63711240da7a9 cxgb4: Convert PDBG to pr_debug
> d054cd530aeef452c7c252504f7d4d6ebba31ae3 cxgb4: Use more common logging style
> 41a74ceecd35cf2f38e2a1a1a394c7718547deb6 cxgb3: Convert PDBG to pr_debug
> 15772862930dfd2f2e10574b86c063d781976a89 cxgb3: Use more common logging style
> 9f7e70ff42dbf3af7ed0699906b699c41930b265 Add linux-next specific files for 20170209
>
> $ git grep -w PDBG 747edc68212781296de30dd2b4e63711240da7a9
> $
In the rdma tree:
$ git log --pretty=oneline -5 a9a42886d0b3
a9a42886d0b3b989166472b7ea59b1c157d90f9b cxgb4: Convert PDBG to pr_debug
700456bd25946ef531773d1ad2dd511e1cc4515e cxgb4: Use more common logging style
b7b37ee0e137c8384c6cb3a37c4621649d5acdf6 cxgb3: Convert PDBG to pr_debug
46b2d4e8eca752003b903e68c3bec6b15fd7eba0 cxgb3: Use more common logging style
cd565b4b51e5fe258d6ce9ddc167ee51f3044ba5 IB/IPoIB: Support acceleration options callbacks
$ git grep -w PDBG a9a42886d0b3
a9a42886d0b3:drivers/infiniband/hw/cxgb4/cm.c: PDBG("%s snd_isn %u\n", __func__, t6req->rsvd);
a9a42886d0b3:drivers/infiniband/hw/cxgb4/cm.c: PDBG("%s snd_isn %u\n", __func__, t6req6->rsvd);
So these were added somewhere in Doug's tree and they need to be fixed
up there. Your patches were rebased/cherrypicked/applied on to Doug's tree.
Ah, the new ones come from commit
192539f4ce36 "iw_cxgb4: clean up send_connect()"
but that is in v4.11-rc1 and so should would not have been in next-20170209.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-04-21 2:22 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 1:42 linux-next: build failure after merge of the rdma tree Stephen Rothwell
2017-04-21 1:58 ` Joe Perches
2017-04-21 2:21 ` Doug Ledford
2017-04-21 2:23 ` Stephen Rothwell
2017-04-21 2:21 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-26 2:51 Stephen Rothwell
2020-02-26 3:04 ` Devesh Sharma
2020-02-26 17:25 ` Jason Gunthorpe
2019-07-09 3:30 Stephen Rothwell
2019-07-09 7:04 ` Mark Zhang
2019-07-09 7:18 ` Leon Romanovsky
2019-07-09 12:43 ` Stephen Rothwell
2019-07-09 13:11 ` Leon Romanovsky
2019-07-09 12:46 ` Jason Gunthorpe
2019-07-10 1:04 ` Stephen Rothwell
2019-07-10 4:30 ` Stephen Rothwell
2019-07-16 23:28 ` Stephen Rothwell
2019-07-17 6:33 ` Masahiro Yamada
2019-07-17 7:45 ` Stephen Rothwell
2019-07-08 3:03 Stephen Rothwell
2019-07-08 14:09 ` Jason Gunthorpe
2019-07-08 2:57 Stephen Rothwell
2019-07-08 16:08 ` Jason Gunthorpe
2019-07-09 3:11 ` Stephen Rothwell
2019-07-25 18:32 ` Dennis Dalessandro
2019-07-01 4:14 Stephen Rothwell
2019-07-01 7:54 ` wangxi
2019-07-01 22:49 ` Jason Gunthorpe
2019-07-04 2:02 ` Stephen Rothwell
2019-07-04 2:04 ` Jason Gunthorpe
2019-07-04 2:10 ` oulijun
2019-07-04 4:07 ` wangxi
2019-07-04 4:10 ` wangxi
2019-07-04 6:31 ` oulijun
2019-07-05 13:15 ` Jason Gunthorpe
2019-07-05 14:59 ` Stephen Rothwell
2018-12-04 0:47 Stephen Rothwell
2018-12-04 1:52 ` Jason Gunthorpe
2018-12-04 9:42 ` Leon Romanovsky
2018-12-07 2:41 ` Stephen Rothwell
2018-12-05 12:25 ` Guy Levi(SW)
2018-12-05 22:58 ` Stephen Rothwell
2018-12-10 0:43 ` Changbin Du
2018-12-10 15:52 ` Masahiro Yamada
2018-01-25 7:22 Stephen Rothwell
2018-01-25 8:50 ` Leon Romanovsky
2018-01-25 16:08 ` Doug Ledford
2017-07-31 2:07 Stephen Rothwell
2017-02-15 0:30 Stephen Rothwell
2017-02-15 1:05 ` Doug Ledford
2017-02-15 5:09 ` Selvin Xavier
2016-09-27 1:23 Stephen Rothwell
2016-09-27 5:04 ` Christoph Hellwig
2016-09-27 5:48 ` Stephen Rothwell
2016-09-27 13:39 ` Christoph Hellwig
2016-09-27 17:15 ` Doug Ledford
2016-09-28 1:43 ` Stephen Rothwell
2016-09-28 15:00 ` Doug Ledford
2016-09-28 15:23 ` Greg KH
2016-09-28 15:26 ` Doug Ledford
2016-09-28 21:45 ` Stephen Rothwell
2016-03-16 1:15 Stephen Rothwell
2016-03-16 6:49 ` Herbert Xu
2016-03-16 19:02 ` Doug Ledford
2016-03-16 20:41 ` Stephen Rothwell
2016-03-16 22:14 ` Ismail, Mustafa
2016-01-13 1:35 Stephen Rothwell
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=20170421122154.45e1f0f2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dledford@redhat.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=swise@opengridcomputing.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 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).