From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Vineet Gupta <Vineet.Gupta1@synopsys.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
Mel Gorman <mgorman@techsingularity.net>
Subject: linux-next: manual merge of the akpm-current tree with the arc-current tree
Date: Fri, 23 Apr 2021 17:23:51 +1000 [thread overview]
Message-ID: <20210423172351.4e3d194b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
net/core/page_pool.c
between commit:
004f078a57d3 ("mm: Fix struct page layout on 32-bit systems")
from the arc-current tree and commit:
8fdd71a69f19 ("net: page_pool: refactor dma_map into own function page_pool_dma_map")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/core/page_pool.c
index f014fd8c19a6,9ec1aa9640ad..000000000000
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@@ -224,11 -192,10 +194,10 @@@ static bool page_pool_dma_map(struct pa
dma = dma_map_page_attrs(pool->p.dev, page, 0,
(PAGE_SIZE << pool->p.order),
pool->p.dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
- if (dma_mapping_error(pool->p.dev, dma)) {
- put_page(page);
- return NULL;
- }
+ if (dma_mapping_error(pool->p.dev, dma))
+ return false;
+
- page->dma_addr = dma;
+ page_pool_set_dma_addr(page, dma);
if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
page_pool_dma_sync_for_device(pool, page, pool->p.max_len);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-04-23 7:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 7:23 Stephen Rothwell [this message]
2021-04-23 14:04 ` linux-next: manual merge of the akpm-current tree with the arc-current tree Vineet Gupta
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=20210423172351.4e3d194b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Vineet.Gupta1@synopsys.com \
--cc=akpm@linux-foundation.org \
--cc=brouer@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mgorman@techsingularity.net \
--cc=willy@infradead.org \
/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).