linux-kernel - linux-next: manual merge of the m68knommu tree with the m68k 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20091126115806.c53684f5.sfr@canb.auug.org.au>
Date:	Thu, 26 Nov 2009 11:58:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg Ungerer <gerg@...pgear.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andreas Schwab <schwab@...ux-m68k.org>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: linux-next: manual merge of the m68knommu tree with the m68k tree

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@...b.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__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/