From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg Ungerer <gerg@snapgear.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: linux-next: manual merge of the m68knommu tree with the m68k tree
Date: Wed, 9 Nov 2011 11:15:02 +1100 [thread overview]
Message-ID: <20111109111502.83ac206d957142cf44840d22@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/kernel/Makefile between commits 4936f63cb790 ("m68k/irq: Add
genirq support") and d890d7399525 ("m68k/irq: Remove obsolete m68k irq
framework") from the m68k tree and commit 7bf6f100a307 ("m68k: merge the
init_task code for mmu and non-mmu targets") from the m68knommu tree.
I fixed it up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/m68k/kernel/Makefile
index c569619,01ae30e..0000000
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@@ -6,15 -6,16 +6,11 @@@ extra-$(CONFIG_MMU) := head.
extra-$(CONFIG_SUN3) := sun3-head.o
extra-y += vmlinux.lds
- obj-y := entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o setup.o \
- signal.o sys_m68k.o syscalltable.o time.o traps.o
-obj-y := entry.o init_task.o m68k_ksyms.o module.o process.o ptrace.o
++obj-y := entry.o irq.o init_task.o m68k_ksyms.o module.o process.o ptrace.o
+ obj-y += setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o
-obj-$(CONFIG_MMU) += ints.o devres.o vectors.o
-devres-$(CONFIG_MMU) = ../../../kernel/irq/devres.o
+obj-$(CONFIG_MMU) += ints.o vectors.o
ifndef CONFIG_MMU_SUN3
obj-y += dma.o
endif
--ifndef CONFIG_MMU
- obj-y += init_task.o
- endif
-
-obj-y += irq.o
-endif
-
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-11-09 0:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-09 0:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:44 linux-next: manual merge of the m68knommu tree with the m68k tree Stephen Rothwell
2022-05-10 3:37 ` Michael Schmitz
2022-05-10 4:15 ` Greg Ungerer
2020-09-09 23:34 Stephen Rothwell
2020-10-13 7:24 ` Stephen Rothwell
2019-07-01 23:09 Stephen Rothwell
2019-07-09 0:25 ` Stephen Rothwell
2011-11-14 0:03 Stephen Rothwell
2011-11-14 0:29 ` Greg Ungerer
2011-11-09 0:15 Stephen Rothwell
2011-11-09 7:08 ` Greg Ungerer
2011-11-09 7:13 ` Geert Uytterhoeven
2011-11-09 7:37 ` Greg Ungerer
2011-11-09 8:19 ` Geert Uytterhoeven
2011-06-22 1:12 Stephen Rothwell
2011-06-22 6:34 ` Greg Ungerer
2011-06-22 8:29 ` Geert Uytterhoeven
2011-06-23 6:12 ` Greg Ungerer
2010-09-14 0:51 Stephen Rothwell
2010-09-14 1:21 ` Greg Ungerer
2010-09-14 8:47 ` Geert Uytterhoeven
2009-11-26 0:58 Stephen Rothwell
2009-11-26 21:29 ` Geert Uytterhoeven
2009-11-27 4:43 ` Greg Ungerer
2009-11-27 8:43 ` Geert Uytterhoeven
2009-11-27 11:23 ` Greg Ungerer
2009-11-27 21:21 ` Geert Uytterhoeven
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=20111109111502.83ac206d957142cf44840d22@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=geert@linux-m68k.org \
--cc=gerg@snapgear.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).