diff --git a/[refs] b/[refs]
index 8f6927803573..7b60bebde90b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: 75f8426c17bc091260a6f7536ba10767596e15eb
+refs/heads/master: 0e3a64e2162f971180bf1fdd91c263dbdfcfd385
diff --git a/trunk/Documentation/SubmittingPatches b/trunk/Documentation/SubmittingPatches
index 1d96efec5e8f..7f43b040311e 100644
--- a/trunk/Documentation/SubmittingPatches
+++ b/trunk/Documentation/SubmittingPatches
@@ -301,68 +301,8 @@ now, but you can do this to mark internal company procedures or just
point out some special detail about the sign-off.
-12) The canonical patch format
-The canonical patch subject line is:
-
- Subject: [PATCH 001/123] [:]
-
-The canonical patch message body contains the following:
-
- - A "from" line specifying the patch author.
-
- - An empty line.
-
- - The body of the explanation, which will be copied to the
- permanent changelog to describe this patch.
-
- - The "Signed-off-by:" lines, described above, which will
- also go in the changelog.
-
- - A marker line containing simply "---".
-
- - Any additional comments not suitable for the changelog.
-
- - The actual patch (diff output).
-
-The Subject line format makes it very easy to sort the emails
-alphabetically by subject line - pretty much any email reader will
-support that - since because the sequence number is zero-padded,
-the numerical and alphabetic sort is the same.
-
-See further details on how to phrase the "" in the
-"Subject:" line in Andrew Morton's "The perfect patch", referenced
-below.
-
-The "from" line must be the very first line in the message body,
-and has the form:
-
- From: Original Author
-
-The "from" line specifies who will be credited as the author of the
-patch in the permanent changelog. If the "from" line is missing,
-then the "From:" line from the email header will be used to determine
-the patch author in the changelog.
-
-The explanation body will be committed to the permanent source
-changelog, so should make sense to a competent reader who has long
-since forgotten the immediate details of the discussion that might
-have led to this patch.
-
-The "---" marker line serves the essential purpose of marking for patch
-handling tools where the changelog message ends.
-
-One good use for the additional comments after the "---" marker is for
-a diffstat, to show what files have changed, and the number of inserted
-and deleted lines per file. A diffstat is especially useful on bigger
-patches. Other comments relevant only to the moment or the maintainer,
-not suitable for the permanent changelog, should also go here.
-
-See more details on the proper patch format in the following
-references.
-
-
-13) More references for submitting patches
+12) More references for submitting patches
Andrew Morton, "The perfect patch" (tpp).
@@ -370,14 +310,6 @@ Andrew Morton, "The perfect patch" (tpp).
Jeff Garzik, "Linux kernel patch submission format."
-Greg KH, "How to piss off a kernel subsystem maintainer"
-
-
-Kernel Documentation/CodingStyle
-
-
-Linus Torvald's mail on the canonical patch format:
-
-----------------------------------
diff --git a/trunk/arch/alpha/kernel/entry.S b/trunk/arch/alpha/kernel/entry.S
index e38671c922bc..76cc0cb5fc2e 100644
--- a/trunk/arch/alpha/kernel/entry.S
+++ b/trunk/arch/alpha/kernel/entry.S
@@ -196,7 +196,6 @@ entUna:
stq $26, 208($sp)
stq $27, 216($sp)
stq $28, 224($sp)
- mov $sp, $19
stq $gp, 232($sp)
lda $8, 0x3fff
stq $31, 248($sp)
diff --git a/trunk/arch/alpha/kernel/traps.c b/trunk/arch/alpha/kernel/traps.c
index f9d12319e0fb..6f509a644bdd 100644
--- a/trunk/arch/alpha/kernel/traps.c
+++ b/trunk/arch/alpha/kernel/traps.c
@@ -446,15 +446,16 @@ struct unaligned_stat {
/* Macro for exception fixup code to access integer registers. */
-#define una_reg(r) (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)])
+#define una_reg(r) (regs.regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)])
asmlinkage void
do_entUna(void * va, unsigned long opcode, unsigned long reg,
- struct allregs *regs)
+ unsigned long a3, unsigned long a4, unsigned long a5,
+ struct allregs regs)
{
long error, tmp1, tmp2, tmp3, tmp4;
- unsigned long pc = regs->pc - 4;
+ unsigned long pc = regs.pc - 4;
const struct exception_table_entry *fixup;
unaligned[0].count++;
@@ -635,7 +636,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
printk("Forwarding unaligned exception at %lx (%lx)\n",
pc, newpc);
- regs->pc = newpc;
+ (®s)->pc = newpc;
return;
}
@@ -649,7 +650,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
current->comm, current->pid);
printk("pc = [<%016lx>] ra = [<%016lx>] ps = %04lx\n",
- pc, una_reg(26), regs->ps);
+ pc, una_reg(26), regs.ps);
printk("r0 = %016lx r1 = %016lx r2 = %016lx\n",
una_reg(0), una_reg(1), una_reg(2));
printk("r3 = %016lx r4 = %016lx r5 = %016lx\n",
@@ -669,10 +670,10 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
una_reg(22), una_reg(23), una_reg(24));
printk("r25= %016lx r27= %016lx r28= %016lx\n",
una_reg(25), una_reg(27), una_reg(28));
- printk("gp = %016lx sp = %p\n", regs->gp, regs+1);
+ printk("gp = %016lx sp = %p\n", regs.gp, ®s+1);
dik_show_code((unsigned int *)pc);
- dik_show_trace((unsigned long *)(regs+1));
+ dik_show_trace((unsigned long *)(®s+1));
if (test_and_set_thread_flag (TIF_DIE_IF_KERNEL)) {
printk("die_if_kernel recursion detected.\n");
diff --git a/trunk/drivers/net/arm/am79c961a.c b/trunk/drivers/net/arm/am79c961a.c
index 9b659e3c8d67..9f6eb39cf492 100644
--- a/trunk/drivers/net/arm/am79c961a.c
+++ b/trunk/drivers/net/arm/am79c961a.c
@@ -85,7 +85,7 @@ static inline unsigned short read_ireg(u_long base_addr, u_int reg)
u_short v;
__asm__(
"str%?h %1, [%2] @ NAT_RAP\n\t"
- "str%?h %0, [%2, #8] @ NET_IDP\n\t"
+ "ldr%?h %0, [%2, #8] @ NET_IDP\n\t"
: "=r" (v)
: "r" (reg), "r" (ISAIO_BASE + 0x0464));
return v;