Re: linux-next: security-testing/net tree build failure

Re: linux-next: security-testing/net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Sep 2009 16:14:32 +1000

> I applied the following merge fix patch (which I can carry as necessary):

Looks good from here, thanks Stephen.

Re: linux-next: security-testing/net tree build failure

[Paul Moore]

On Thursday 03 September 2009 02:16:07 am David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 3 Sep 2009 16:14:32 +1000
>
> > I applied the following merge fix patch (which I can carry as necessary):
>
> Looks good from here, thanks Stephen.

Looks good over here too, thanks.

-- 
paul moore
linux @ hp

Re: linux-next: security-testing/net tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 551 bytes --]

On Thu, 3 Sep 2009 09:10:20 -0400 Paul Moore <paul.moore@hp.com> wrote:
>
> On Thursday 03 September 2009 02:16:07 am David Miller wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 3 Sep 2009 16:14:32 +1000
> >
> > > I applied the following merge fix patch (which I can carry as necessary):
> >
> > Looks good from here, thanks Stephen.
> 
> Looks good over here too, thanks.

Thanks for the confirmations.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: security-testing/net tree build failure

[Michael S. Tsirkin]

On Thu, Sep 03, 2009 at 04:14:32PM +1000, Stephen Rothwell wrote:
> I applied the following merge fix patch (which I can carry as necessary):

Looks good to me.

Re: linux-next: security-testing/net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Sep 2009 13:01:54 +1000

> On Thu, 3 Sep 2009 16:14:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this (this
>> was reverting to the security-testing tree in next-20090902):
>> 
>> drivers/net/tun.c: In function 'tun_set_iff':
>> drivers/net/tun.c:937: error: 'struct tun_struct' has no member named 'sk'
>> 
>> Caused by commit 2b980dbd77d229eb60588802162c9659726b11f4 ("lsm: Add
>> hooks to the TUN driver") interacting with commit
>> 89f56d1e91cfa535ccc6cc60e9e12e02682fd972 ("tun: reuse struct sock
>> fields") from the net tree.
>> 
>> I applied the following merge fix patch (which I can carry as necessary):
> 
> This patch now needs to be applied to the net tree (as the
> security-testing tree has been merged by Linus).  I have applied it as a
> merge fix for today.

Ok, since I already sent a merge request to Linus I'll submit this
as soon as he does that pull.

I don't like "slipping" in things to a tree I've already asked
him to pull from, and in this case especially since I'd have
to merge his tree in to keep net-next-2.6 itself building.
:-)

Re: linux-next: security-testing/net tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

Hi Dave,

On Sun, 13 Sep 2009 21:46:44 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Ok, since I already sent a merge request to Linus I'll submit this
> as soon as he does that pull.
> 
> I don't like "slipping" in things to a tree I've already asked
> him to pull from, and in this case especially since I'd have
> to merge his tree in to keep net-next-2.6 itself building.
> :-)

You might like to send him an email pointing out this merge fix, as when
he merges your tree, it will fail to build tun ... and, if he is told, he
can put this fix in the merge commit so there is no bisection breakage.
This is all presuming that commit
89f56d1e91cfa535ccc6cc60e9e12e02682fd972 ("tun: reuse struct sock
fields") is in the tree you asked him to pull.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: security-testing/net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Sep 2009 14:56:23 +1000

> You might like to send him an email pointing out this merge fix, as when
> he merges your tree, it will fail to build tun ... and, if he is told, he
> can put this fix in the merge commit so there is no bisection breakage.
> This is all presuming that commit
> 89f56d1e91cfa535ccc6cc60e9e12e02682fd972 ("tun: reuse struct sock
> fields") is in the tree you asked him to pull.

Good idea, I'll do that.