All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vinod.koul@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Viresh Kumar <viresh.kumar@st.com>,
	Russell King <rmk+kernel@arm.linux.org.uk>
Subject: linux-next: manual merge of the slave-dma tree with Linus' tree
Date: Fri, 26 Aug 2011 11:46:31 +1000	[thread overview]
Message-ID: <20110826114631.cbde20838388094f96053764@canb.auug.org.au> (raw)

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/amba-pl08x.c between commit 4d66164e997e ("dmaengine: PL08x:
Fix trivial build error") from Linus' tree and commit 0c38d7013913
("dmaengine/amba-pl08x: Rearrange inclusion of header files in ascending
order") from the slave-dma tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/dma/amba-pl08x.c
index be21e3f,849eab8..0000000
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@@ -77,17 -72,16 +72,17 @@@
  #include <linux/amba/bus.h>
  #include <linux/amba/pl08x.h>
  #include <linux/debugfs.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dmapool.h>
++#include <linux/dma-mapping.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+ #include <linux/pm_runtime.h>
  #include <linux/seq_file.h>
- 
+ #include <linux/slab.h>
  #include <asm/hardware/pl080.h>
  
  #define DRIVER_NAME	"pl08xdmac"

             reply	other threads:[~2011-08-26  1:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-26  1:46 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-12  5:26 linux-next: manual merge of the slave-dma tree with Linus' tree Stephen Rothwell
2020-03-12  7:16 ` Peter Ujfalusi
2020-03-13 12:42   ` Vinod Koul
2019-06-11  6:32 Stephen Rothwell
2019-06-11 10:08 ` Vinod Koul
2019-02-26  4:24 Stephen Rothwell
2019-02-26 17:22 ` Vinod Koul
2019-01-23  2:41 Stephen Rothwell
2012-12-18 23:44 Stephen Rothwell
2012-03-27  0:45 Stephen Rothwell
2012-03-09  2:25 Stephen Rothwell
2011-07-27  2:08 Stephen Rothwell
2011-07-27  3:12 ` Koul, Vinod
2011-07-27 16:25   ` Koul, Vinod
2011-07-27 16:25     ` Koul, Vinod
2011-07-27 20:19     ` Russell King - ARM Linux
2011-07-27 20:29       ` Grant Likely

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=20110826114631.cbde20838388094f96053764@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=vinod.koul@intel.com \
    --cc=viresh.kumar@st.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.