linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	Russell King <linux@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Will Deacon <will.deacon@arm.com>,
	Laurent Dufour <ldufour@linux.vnet.ibm.com>
Subject: linux-next: manual merge of the akpm-current tree with the arm tree
Date: Thu, 16 Jul 2015 14:50:19 +1000	[thread overview]
Message-ID: <20150716145019.03c07a2e@canb.auug.org.au> (raw)

Hi Andrew,

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

  arch/arm/include/asm/Kbuild

between commit:

  57853e8906a0 ("ARM: 8403/1: kbuild: don't use generic mcs_spinlock.h header")

from the arm tree and commit:

  74cf1a5a0c64 ("mm: clean up per architecture MM hook header files")

from the akpm-current tree.

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

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

diff --cc arch/arm/include/asm/Kbuild
index 517ef6dd22b9,30b3bc1666d2..000000000000
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -12,6 -12,8 +12,7 @@@ generic-y += irq_regs.
  generic-y += kdebug.h
  generic-y += local.h
  generic-y += local64.h
 -generic-y += mcs_spinlock.h
+ generic-y += mm-arch-hooks.h
  generic-y += msgbuf.h
  generic-y += param.h
  generic-y += parport.h

             reply	other threads:[~2015-07-16  4:50 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-16  4:50 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
2016-07-15  8:38 Stephen Rothwell
2015-12-07  8:00 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:
  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=20150716145019.03c07a2e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=ldufour@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=will.deacon@arm.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 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).