Message ID | 51D2A2A6.5020909@canonical.com |
---|---|
State | New |
Headers | show |
On Tue, Jul 02, 2013 at 02:51:34AM -0700, John Johansen wrote:
> UBUNTU: SAUCE: apparmor: 3.0 backport fix list_splice_init_rcu 7f708931
This seems to have a >>>>> conflict marker in it. So I suspect it is
not the one you tested.
+>>>>>>> 79276e0... UBUNTU: SAUCE: apparmor: 3.0 backport fix list_splice_init_rcu 7f708931
-apw