mbox

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

Message ID 51D39894.6000609@canonical.com
State New
Headers show

Pull-request

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

Message

John Johansen July 3, 2013, 3:20 a.m. UTC 
On 07/02/2013 06:57 AM, Andy Whitcroft wrote:
> 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.
> 
sorry I messed up the push and needed to force it. I've repushed pulled, and done
a build test. Here is the correct pull request


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:

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

for you to fetch changes up to 3af2e0ca5efc3a9bb8c5df06f29ccd63aea2c0a8:

  UBUNTU: SAUCE: apparmor: 3.0 backport fix list_splice_init_rcu 7f708931 (2013-07-02 19:44:55 -0700)

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

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

Comments

Andy Whitcroft July 3, 2013, 2:06 p.m. UTC | #1 
On Tue, Jul 02, 2013 at 08:20:52PM -0700, John Johansen wrote:
> On 07/02/2013 06:57 AM, Andy Whitcroft wrote:
> > 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.
> > 
> sorry I messed up the push and needed to force it. I've repushed pulled, and done
> a build test. Here is the correct pull request
> 
> 
> 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:
> 
>   git://kernel.ubuntu.com/jj/ubuntu-saucy.git maguro-apparmor3
> 
> for you to fetch changes up to 3af2e0ca5efc3a9bb8c5df06f29ccd63aea2c0a8:
> 
>   UBUNTU: SAUCE: apparmor: 3.0 backport fix list_splice_init_rcu 7f708931 (2013-07-02 19:44:55 -0700)

Thanks John, this one looks much better.  Applied.

-apw