From: Mark Brown <broonie@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>,
Christoph Hellwig <hch@lst•de>,
Matthew Wilcox <willy@infradead•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
linux-arm-kernel@lists•infradead.org
Subject: linux-next: manual merge of the akpm-current tree with the dma-mapping tree
Date: Mon, 16 Sep 2019 03:46:43 +0100 [thread overview]
Message-ID: <20190916024643.GV4352@sirena.co.uk> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 531 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/include/asm/xen/page-coherent.h
between commits:
bef4d2037d2143a ("xen/arm: consolidate page-coherent.h")
60d8cd572f655aa ("arm64/xen: fix xen-swiotlb cache flushing")
from the dma-mapping tree and commit:
46d5fa030cd9225 ("mm: introduce compound_nr()")
from the akpm-current tree. The former appear to make the latter
redundant so I resolved by dropping the relevant portions of the
commit from the akpm tree.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
reply other threads:[~2019-09-16 2:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190916024643.GV4352@sirena.co.uk \
--to=broonie@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)org \
/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