[saucy,Pull,Request] Sauce: fix apparmor3 backtrace on maguro

This patch fixes the back trace that is happening on the maguro kernel

[  139.262542] WARNING: at /build/buildd/linux-maguro-3.0.0/security/apparmor/policy.c:459 __add_profile+0xcc/0x13c()
[  139.262542] AppArmor WARN __add_profile: ((l != &profile->label)): 
[  139.262542] Modules linked in:
[  139.262573] Backtrace: 
[  139.262573] [<c005a748>] (dump_backtrace+0x0/0x10c) from [<c0671be8>] (dump_stack+0x18/0x1c)
[  139.262573]  r6:c0829ef8 r5:000001cb r4:c37abe70 r3:271aed03
[  139.262603] [<c0671bd0>] (dump_stack+0x0/0x1c) from [<c00a6fd8>] (warn_slowpath_common+0x54/0x6c)
[  139.262603] [<c00a6f84>] (warn_slowpath_common+0x0/0x6c) from [<c00a7094>] (warn_slowpath_fmt+0x38/0x40)
[  139.262634]  r8:c338a010 r7:c37abee0 r6:c37abee0 r5:c338b018 r4:c37abe94
[  139.262634] r3:00000009
[  139.262664] [<c00a705c>] (warn_slowpath_fmt+0x0/0x40) from [<c026d5f0>] (__add_profile+0xcc/0x13c)
[  139.262664]  r3:c06a79a4 r2:c082a064
[  139.262664]  r4:c38ae818
[  139.262695] [<c026d524>] (__add_profile+0x0/0x13c) from [<c026e8ac>] (aa_replace_profiles+0x4b8/0x5cc)
[  139.262695]  r5:c338b018 r4:c3224800
[  139.262695] [<c026e3f4>] (aa_replace_profiles+0x0/0x5cc) from [<c02692a8>] (profile_replace+0x40/0x58)
[  139.262725] [<c0269268>] (profile_replace+0x0/0x58) from [<c015c820>] (vfs_write+0xac/0x13c)
[  139.262725]  r5:00025826 r4:c4388460
[  139.262756] [<c015c774>] (vfs_write+0x0/0x13c) from [<c015ca9c>] (sys_write+0x44/0x70)
[  139.262756]  r8:00000000 r7:00000004 r6:00025826 r5:4024a051 r4:c4388460
[  139.262786] [<c015ca58>] (sys_write+0x0/0x70) from [<c0056480>] (ret_fast_syscall+0x0/0x30)
[  139.262786]  r9:c37aa000 r8:c0056648 r6:0002e86f r5:00000001 r4:4024a051


The following changes since commit 4c6543e8535e9dcac0818df20c56ea29486bc97a:

  UBUNTU: Ubuntu-maguro-3.0.0-3.9 (2013-06-25 11:19:53 -0600)

are available in the git repository at:

  ssh://kernel.ubuntu.com/srv/kernel.ubuntu.com/git/jj/ubuntu-saucy.git maguro-apparmor3

for you to fetch changes up to 1161fef514636a6207686dcd81b33f7b105e004f:

  UBUNTU: SAUCE: apparmor: 3.0 backport fix list_splice_init_rcu 7f708931 (2013-07-02 02:20:34 -0700)

----------------------------------------------------------------
John Johansen (1):
      UBUNTU: SAUCE: apparmor: 3.0 backport fix list_splice_init_rcu 7f708931

 security/apparmor/include/backport.h | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

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