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,
Andreas Schwab <schwab@linux-m68k•org>,
Geert Uytterhoeven <geert@linux-m68k•org>
Subject: linux-next: manual merge of the m68knommu tree with the m68k tree
Date: Thu, 26 Nov 2009 11:58:06 +1100 [thread overview]
Message-ID: <20091126115806.c53684f5.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/include/asm/ptrace.h between commit
63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
ptrace requests") from the m68k tree and commit
03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
arch_has_single_step() and friends") from the m68knommu tree.
These mostly add the same stuff but not quite :-(
I have done a fixup (see below) and can carry it as necessary. Please
check the result.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/m68k/include/asm/ptrace.h
index eef9309,beb2091..0000000
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@@ -86,14 -84,15 +86,18 @@@ struct switch_stack
extern void show_regs(struct pt_regs *);
/*
- * These are defined as per linux/ptrace.h.
+ * These are defined as per linux/ptrace.h, which see.
*/
+ struct task_struct;
+
-#ifndef CONFIG_MMU
-#define arch_has_single_step() (1)
+#define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
+
++#ifdef CONFIG_MMU
+#define arch_has_block_step() (1)
+extern void user_enable_block_step(struct task_struct *);
+ #endif
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
next reply other threads:[~2009-11-26 0:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-26 0:58 Stephen Rothwell [this message]
2009-11-26 21:29 ` linux-next: manual merge of the m68knommu tree with the m68k tree 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
-- strict thread matches above, loose matches on Subject: below --
2010-09-14 0:51 Stephen Rothwell
2010-09-14 1:21 ` Greg Ungerer
2010-09-14 8:47 ` 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
2011-11-09 0:15 Stephen Rothwell
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-11-14 0:03 Stephen Rothwell
2011-11-14 0:29 ` Greg Ungerer
2019-07-01 23:09 Stephen Rothwell
2019-07-09 0:25 ` Stephen Rothwell
2020-09-09 23:34 Stephen Rothwell
2020-10-13 7:24 ` Stephen Rothwell
2022-05-09 23:44 Stephen Rothwell
2022-05-10 3:37 ` Michael Schmitz
2022-05-10 4:15 ` Greg Ungerer
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=20091126115806.c53684f5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=geert@linux-m68k$(echo .)org \
--cc=gerg@snapgear$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwab@linux-m68k$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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