lkml.org 
[lkml]   [2012]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the driver-core tree with the arm tree
On Wed, Dec 28, 2011 at 04:24:31PM +1100, Stephen Rothwell wrote:
> Hi again,
>
> On Wed, 28 Dec 2011 16:12:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the driver-core tree got a conflict in
> > arch/arm/mach-s3c64xx/common.c between commit b024043b6d0d ("ARM: 7245/1:
> > S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
> > and commit edbaa603eb80 ("driver-core: remove sysdev.h usage") from the
> > driver-core tree (where it is called arch/arm/mach-s3c64xx/irq-eint.c).
> >
> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
>
> Actually, I the fix was more extensive (see below).

Ick, messy, thanks, that looks good.

greg k-h


\
 
 \ /
  Last update: 2012-01-05 00:13    [W:0.034 / U:1.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site