linux-kernel - linux-next: manual merge of the samsung tree with the slave-dma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130118143110.8555b3708e3b7674c090f93e@canb.auug.org.au>
Date:	Fri, 18 Jan 2013 14:31:10 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alessandro Rubini <rubini@...dd.com>,
	Vinod Koul <vinod.koul@...el.com>
Subject: linux-next: manual merge of the samsung tree with the slave-dma
 tree

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s3c64xx/dma.c between commit 3a95b9fbba89 ("pl080.h: moved
from arm/include/asm/hardware to include/linux/amba/") from the slave-dma
tree and commit f2bfd174bdc0 ("ARM: S3C64XX: make regs-sys.h local") from
the samsung tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-s3c64xx/dma.c
index a77f521,ec29b35..0000000
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@@ -29,8 -28,9 +29,7 @@@
  #include <mach/map.h>
  #include <mach/irqs.h>

- #include <mach/regs-sys.h>
- 
 -#include <asm/hardware/pl080.h>
 -
+ #include "regs-sys.h"

  /* dma channel state information */

Content of type "application/pgp-signature" skipped