archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Andrew Morton <>,
	Russell King <>
	Krzysztof Kozlowski <>,
	Gregory CLEMENT <>
Subject: linux-next: manual merge of the akpm-current tree with the arm tree
Date: Fri, 15 Jul 2016 18:38:50 +1000	[thread overview]
Message-ID: <> (raw)

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:


between commit:

  f12708965069 ("ARM: 8561/3: dma-mapping: Don't use outer_flush_range when the L2C is coherent")

from the arm tree and patch:

   "dma-mapping: remove dma_get_attr"

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.

Stephen Rothwell

diff --cc arch/arm/mm/dma-mapping.c
index 40d3a9be7832,43e03b5293d0..000000000000
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -763,8 -744,7 +763,8 @@@ static void *__dma_alloc(struct device 
  		.gfp = gfp,
  		.prot = prot,
  		.caller = caller,
- 		.want_vaddr = !dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs),
+ 		.want_vaddr = ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) == 0),
 +		.coherent_flag = is_coherent ? COHERENT : NORMAL,

             reply	other threads:[~2016-07-15  8:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-15  8:38 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-08-24  9:10 linux-next: manual merge of the akpm-current tree with the arm tree Stephen Rothwell
2021-09-06  4:46 ` Stephen Rothwell
2015-12-07  8:00 Stephen Rothwell
2015-07-16  4:50 Stephen Rothwell
2014-06-02  8:42 Stephen Rothwell
2014-04-24  5:25 Stephen Rothwell
2014-04-24 14:27 ` Mark Salter

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* 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).