[saucy][Pull Request] Sauce: fix apparmor3 backtrace on maguro
Andy Whitcroft
apw at canonical.com
Tue Jul 2 13:57:09 UTC 2013
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
More information about the kernel-team
mailing list