From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Christoph Hellwig <hch@lst•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Florian Fainelli <f.fainelli@gmail•com>,
Huang Shijie <sjhuang@iluvatar•ai>
Subject: linux-next: manual merge of the akpm-current tree with the dma-mapping tree
Date: Mon, 17 Jun 2019 18:14:39 +1000 [thread overview]
Message-ID: <20190617181439.42cf10e5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1274 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
kernel/dma/remap.c
between commit:
4b4b077cbd0a ("dma-remap: Avoid de-referencing NULL atomic_pool")
from the dma-mapping tree and commit:
14de8ba3fa2e ("lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr")
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 kernel/dma/remap.c
index 0207e3764d52,2b750f13bc8f..000000000000
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@@ -158,10 -158,7 +158,10 @@@ out
bool dma_in_atomic_pool(void *start, size_t size)
{
+ if (unlikely(!atomic_pool))
+ return false;
+
- return addr_in_gen_pool(atomic_pool, (unsigned long)start, size);
+ return gen_pool_has_addr(atomic_pool, (unsigned long)start, size);
}
void *dma_alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-06-17 8:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 8:14 Stephen Rothwell [this message]
2019-06-17 8:15 ` linux-next: manual merge of the akpm-current tree with the dma-mapping tree Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2020-09-16 4:11 Stephen Rothwell
2020-09-16 4:22 ` Song Bao Hua (Barry Song)
2020-09-16 4:35 ` Christoph Hellwig
2019-09-16 2:46 Mark Brown
2019-08-21 7:28 Stephen Rothwell
2019-06-03 5:01 Stephen Rothwell
2018-09-10 4:06 Stephen Rothwell
2018-05-10 6:39 Stephen Rothwell
2014-10-28 4:24 Stephen Rothwell
2014-10-28 6:29 ` Andrew Morton
2014-10-28 6:54 ` Marek Szyprowski
2014-10-28 20:26 ` Andrew Morton
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=20190617181439.42cf10e5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=f.fainelli@gmail$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sjhuang@iluvatar$(echo .)ai \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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