archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Paul Mundt <>
Cc:, Martin Schwidefsky <>
Subject: linux-next: manual merge of the sh tree
Date: Fri, 17 Oct 2008 10:54:02 +1100	[thread overview]
Message-ID: <> (raw)

Hi Paul,

Today's linux-next merge of the sh tree got a conflict in
arch/sh/include/asm/elf.h between commit
0b59268285ca6cdc46191f2995bf632088e3e277 ("[PATCH] remove unused
ibcs2/PER_SVR4 in SET_PERSONALITY") from Linus' tree and commit
0e660d2d433393f983cd58fe8c54f831fa7c7713 ("sh: Tidy up ELF core dumps")
from the sh tree.

Just a context change.  I fixed it up (see below).
Stephen Rothwell          

diff --cc arch/sh/include/asm/elf.h
index ee02db1,4da3a0b..0000000
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@@ -189,13 -197,7 +197,7 @@@ do {									
  } while (0)
 -#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
 +#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
- struct task_struct;
- extern int dump_task_regs (struct task_struct *, elf_gregset_t *);
- extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
- #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
- #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
  /* vDSO has arch_setup_additional_pages */

             reply	other threads:[~2008-10-16 23:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-16 23:54 Stephen Rothwell [this message]
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the sh tree Thierry Reding
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the sh tree Thierry Reding
2013-10-01 13:53   ` Greg Kroah-Hartman

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* 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).