Re: [PATCH] ppc64 mismerge

From: Jeremy Kerr
Date: Sun Jul 22 2007 - 03:16:29 EST

Next message: Al Viro: "Re: [RFC] Kconfig fun with sparc32/sparc64 rtc drivers"
Previous message: Al Viro: "[PATCH] deal with rtc/sun_mostek_rtc conflict on sparc32"
In reply to: Al Viro: "[PATCH] ppc64 mismerge"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

> Mismerge in
> commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10
> Author: Jeremy Kerr <jk@xxxxxxxxxx>
> Date: Sat Jul 21 04:37:51 2007 -0700
> spufs: make signal-notification files readonly for NOSCHED
> contexts
>
> structs got duplicated.
>
> Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

Yep, the original patch can be applied more than once without fuzz :/

Acked-by: Jeremy Kerr <jk@xxxxxxxxxx>

Jeremy
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Al Viro: "Re: [RFC] Kconfig fun with sparc32/sparc64 rtc drivers"
Previous message: Al Viro: "[PATCH] deal with rtc/sun_mostek_rtc conflict on sparc32"
In reply to: Al Viro: "[PATCH] ppc64 mismerge"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]