From: Christoph Hellwig <hch@lst.de>
To: Alexander Lobakin <aleksander.lobakin@intel.com>
Cc: Christoph Hellwig <hch@lst.de>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the dma-mapping tree
Date: Wed, 8 May 2024 15:45:17 +0200 [thread overview]
Message-ID: <20240508134517.GA8526@lst.de> (raw)
In-Reply-To: <cdc6c9e4-d604-4ae5-a56b-d8e9264ce5aa@intel.com>
On Wed, May 08, 2024 at 10:51:28AM +0200, Alexander Lobakin wrote:
> I'm verry sorry for that. I had 2 trees, one with const get_dma_addr()
> and dma-for-next without const, and didn't check it compiles after
> rebasing >_<
>
> net-next already has this const. We could leave it as in your attached
> patch, but then there'll be a trivial conflict when merging with
> net-next. Or I can send an incremental quick fix for dma-for-next, but
> then 2 commits (one in your tree and one in net-next) will have these
> changes duplicated.
> What do you think?
Let's just add the const annoations after the trees are merged into
Linus' tree. Nothing really wrong with not having them right now.
next prev parent reply other threads:[~2024-05-08 13:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 23:16 linux-next: build failure after merge of the dma-mapping tree Stephen Rothwell
2024-05-08 6:51 ` Christoph Hellwig
2024-05-08 8:51 ` Alexander Lobakin
2024-05-08 13:45 ` Christoph Hellwig [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-11-27 6:58 Stephen Rothwell
2020-11-27 9:21 ` Christoph Hellwig
2020-11-27 9:59 ` Stephen Rothwell
2020-11-27 9:33 ` Christoph Hellwig
2012-02-13 5:40 Stephen Rothwell
2012-02-13 7:31 ` Kyungmin Park
2012-02-13 15:05 ` Marek Szyprowski
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=20240508134517.GA8526@lst.de \
--to=hch@lst.de \
--cc=aleksander.lobakin@intel.com \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).