Staging: batman-adv for 2.6.36 (2)

Message ID 201006220059.48628.sven.eckelmann@gmx.de (mailing list archive)
State Not Applicable, archived
Headers

Commit Message

Sven Eckelmann June 21, 2010, 10:59 p.m. UTC
  Greg KH wrote:
> On Sat, Jun 19, 2010 at 02:51:45AM +0200, Sven Eckelmann wrote:
> > Hi,
> > 
> > here are patches targetted for 2.6.36. They are made on top of patches
> > you have
> > 
> > already received in 1275852501-28523-1-git-send-email-sven.eckelmann@gmx.de :
> >  * Staging: batman-adv: remove redundant struct declaration
> >  * Staging: batman-adv: Move device for icmp injection to debugfs
> >  * Staging: batman-adv: Move tables from sysfs to debugfs
> >  * Staging: batman-adv: convert all sysfs files to single value files
> >  * Staging: batman-adv: Adding netfilter-bridge hooks
> >  * Staging: batman-adv: Add information about batman-adv sysfs entries
> >  * Staging: batman-adv: remove superfluous hint to "translation table"
> >  * Staging: batman-adv: convert vis_interval into define
> >  * Staging: batman-adv: Convert MAC_FMT to %pM
> > 
> > They also depend on patches not yet applied on 2.6.35, but sent to you:
> >  * Staging: batman-adv: return -EFAULT on copy_to_user errors
> >  * Staging: batman-adv: fix function prototype
> 
> Something's still not right.  I applied the above 2 patches, and then
> tried to apply the 1/8 patch above:
> 	Subject: [PATCH 1/8] Staging: batman-adv: Mark locally used symbols as
> static
> 
> It fails with:
> 	patching file drivers/staging/batman-adv/bitarray.c
> 	patching file drivers/staging/batman-adv/bitarray.h
> 	patching file drivers/staging/batman-adv/hash.c
> 	patching file drivers/staging/batman-adv/hash.h
> 	patching file drivers/staging/batman-adv/originator.c
> 	patching file drivers/staging/batman-adv/originator.h
> 	patching file drivers/staging/batman-adv/routing.c
> 	patching file drivers/staging/batman-adv/routing.h
> 	patching file drivers/staging/batman-adv/send.c
> 	patching file drivers/staging/batman-adv/send.h
> 	patching file drivers/staging/batman-adv/soft-interface.c
> 	patching file drivers/staging/batman-adv/soft-interface.h
> 	patching file drivers/staging/batman-adv/translation-table.c
> 	Hunk #2 succeeded at 250 (offset 5 lines).
> 	Hunk #3 succeeded at 442 with fuzz 1 (offset 16 lines).
> 	patching file drivers/staging/batman-adv/translation-table.h
> 	Hunk #1 FAILED at 26.
> 	1 out of 1 hunk FAILED -- saving rejects to file
> drivers/staging/batman-adv/translation-table.h.rej patching file
> drivers/staging/batman-adv/vis.c
> 	patching file drivers/staging/batman-adv/vis.h
> 	Hunk #1 FAILED at 44.
> 	1 out of 1 hunk FAILED -- saving rejects to file
> drivers/staging/batman-adv/vis.h.rej
> 
> So, any thoughts?

I have currently no idea what you try to achieve by applying all patches out
of order, but you have done following:

 * Staging: batman-adv: return -EFAULT on copy_to_user errors
 * Staging: batman-adv: fix function prototype
 * Staging: batman-adv: Mark locally used symbols as static
   => of course fails because it was applied out of order and misses
      9 patches inbetween


Right thing to do:
 * Staging: batman-adv: return -EFAULT on copy_to_user errors
 * Staging: batman-adv: fix function prototype
 * Staging: batman-adv: remove redundant struct declaration
 * Staging: batman-adv: Move device for icmp injection to debugfs
 * Staging: batman-adv: Move tables from sysfs to debugfs
 * Staging: batman-adv: convert all sysfs files to single value files
 * Staging: batman-adv: Adding netfilter-bridge hooks
 * Staging: batman-adv: Add information about batman-adv sysfs entries
 * Staging: batman-adv: remove superfluous hint to "translation table"
 * Staging: batman-adv: convert vis_interval into define
 * Staging: batman-adv: Convert MAC_FMT to %pM
 * Staging: batman-adv: Mark locally used symbols as static
 * Staging: batman-adv: Ignore debugfs on kernels without debugfs support
 * Staging: batman-adv: permit setting ogm interval to JITTER*2
 * Staging: batman-adv: Add release information for version 2010.0.0
 * Staging: batman-adv: 32bit sequence number and TTL for broadcasts
 * Staging: batman-adv: Add bonding functionality
 * Staging: batman-adv: bonding and interface alternating
 * Staging: batman-adv: record route for ICMP messages


Just saved my patch queues as 2.6.35.mbox, 2.6.36_renewed.mbox, 2.6.36_2.mbox
and created a temporary gregkh branch of linux-next/master:

$ git am -3 ~/2.6.35.mbox 
Applying: Staging: batman-adv: return -EFAULT on copy_to_user errors
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Staging: batman-adv: fix function prototype
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
$ git am -3 ~/2.6.36_renewed.mbox 
Applying: Staging: batman-adv: remove redundant struct declaration
Applying: Staging: batman-adv: Move device for icmp injection to debugfs
Applying: Staging: batman-adv: Move tables from sysfs to debugfs
Applying: Staging: batman-adv: convert all sysfs files to single value files
Applying: Staging: batman-adv: Adding netfilter-bridge hooks
Applying: Staging: batman-adv: Add information about batman-adv sysfs entries
Applying: Staging: batman-adv: remove superfluous hint to "translation table"
Applying: Staging: batman-adv: convert vis_interval into define
Applying: Staging: batman-adv: Convert MAC_FMT to %pM
$ git am -3 ~/2.6.36_2.mbox 
Applying: Staging: batman-adv: Mark locally used symbols as static
Applying: Staging: batman-adv: Ignore debugfs on kernels without debugfs support
Applying: Staging: batman-adv: permit setting ogm interval to JITTER*2
Applying: Staging: batman-adv: Add release information for version 2010.0.0
Applying: Staging: batman-adv: 32bit sequence number and TTL for broadcasts
Applying: Staging: batman-adv: Add bonding functionality
Applying: Staging: batman-adv: bonding and interface alternating
Applying: Staging: batman-adv: record route for ICMP messages

So, linux-next has already following patches applied:
 * Staging: batman-adv: return -EFAULT on copy_to_user errors
 * Staging: batman-adv: fix function prototype

All remaining patches are missing and apply cleanly.

Now the same for staging-next (branch staging-next):
$ git am -3 ~/2.6.35.mbox                          
Applying: Staging: batman-adv: return -EFAULT on copy_to_user errors
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Staging: batman-adv: fix function prototype
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/staging/batman-adv/bat_sysfs.c
No changes -- Patch already applied.
$ git am -3 ~/2.6.36_renewed.mbox 
Applying: Staging: batman-adv: remove redundant struct declaration
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Staging: batman-adv: Move device for icmp injection to debugfs
Applying: Staging: batman-adv: Move tables from sysfs to debugfs
Applying: Staging: batman-adv: convert all sysfs files to single value files
Applying: Staging: batman-adv: Adding netfilter-bridge hooks
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Staging: batman-adv: Add information about batman-adv sysfs entries
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Staging: batman-adv: remove superfluous hint to "translation table"
Applying: Staging: batman-adv: convert vis_interval into define
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Staging: batman-adv: Convert MAC_FMT to %pM
$ git am -3 ~/2.6.36_2.mbox 
Applying: Staging: batman-adv: Mark locally used symbols as static
Applying: Staging: batman-adv: Ignore debugfs on kernels without debugfs support
Applying: Staging: batman-adv: permit setting ogm interval to JITTER*2
Applying: Staging: batman-adv: Add release information for version 2010.0.0
Applying: Staging: batman-adv: 32bit sequence number and TTL for broadcasts
Applying: Staging: batman-adv: Add bonding functionality
Applying: Staging: batman-adv: bonding and interface alternating
Applying: Staging: batman-adv: record route for ICMP messages

More patches are already in staging-next, but all remaining apply cleanly.

A diff between those two repositories only give me a change which was applied
by the net folks for their 2.6.36 branch:




So I would say that everything should work as expected.

Best regards,
	Sven
  

Comments

Greg KH June 21, 2010, 11:16 p.m. UTC | #1
On Tue, Jun 22, 2010 at 12:59:47AM +0200, Sven Eckelmann wrote:
> Greg KH wrote:
> > On Sat, Jun 19, 2010 at 02:51:45AM +0200, Sven Eckelmann wrote:
> > > Hi,
> > > 
> > > here are patches targetted for 2.6.36. They are made on top of patches
> > > you have
> > > 
> > > already received in 1275852501-28523-1-git-send-email-sven.eckelmann@gmx.de :
> > >  * Staging: batman-adv: remove redundant struct declaration
> > >  * Staging: batman-adv: Move device for icmp injection to debugfs
> > >  * Staging: batman-adv: Move tables from sysfs to debugfs
> > >  * Staging: batman-adv: convert all sysfs files to single value files
> > >  * Staging: batman-adv: Adding netfilter-bridge hooks
> > >  * Staging: batman-adv: Add information about batman-adv sysfs entries
> > >  * Staging: batman-adv: remove superfluous hint to "translation table"
> > >  * Staging: batman-adv: convert vis_interval into define
> > >  * Staging: batman-adv: Convert MAC_FMT to %pM
> > > 
> > > They also depend on patches not yet applied on 2.6.35, but sent to you:
> > >  * Staging: batman-adv: return -EFAULT on copy_to_user errors
> > >  * Staging: batman-adv: fix function prototype
> > 
> > Something's still not right.  I applied the above 2 patches, and then
> > tried to apply the 1/8 patch above:
> > 	Subject: [PATCH 1/8] Staging: batman-adv: Mark locally used symbols as
> > static
> > 
> > It fails with:
> > 	patching file drivers/staging/batman-adv/bitarray.c
> > 	patching file drivers/staging/batman-adv/bitarray.h
> > 	patching file drivers/staging/batman-adv/hash.c
> > 	patching file drivers/staging/batman-adv/hash.h
> > 	patching file drivers/staging/batman-adv/originator.c
> > 	patching file drivers/staging/batman-adv/originator.h
> > 	patching file drivers/staging/batman-adv/routing.c
> > 	patching file drivers/staging/batman-adv/routing.h
> > 	patching file drivers/staging/batman-adv/send.c
> > 	patching file drivers/staging/batman-adv/send.h
> > 	patching file drivers/staging/batman-adv/soft-interface.c
> > 	patching file drivers/staging/batman-adv/soft-interface.h
> > 	patching file drivers/staging/batman-adv/translation-table.c
> > 	Hunk #2 succeeded at 250 (offset 5 lines).
> > 	Hunk #3 succeeded at 442 with fuzz 1 (offset 16 lines).
> > 	patching file drivers/staging/batman-adv/translation-table.h
> > 	Hunk #1 FAILED at 26.
> > 	1 out of 1 hunk FAILED -- saving rejects to file
> > drivers/staging/batman-adv/translation-table.h.rej patching file
> > drivers/staging/batman-adv/vis.c
> > 	patching file drivers/staging/batman-adv/vis.h
> > 	Hunk #1 FAILED at 44.
> > 	1 out of 1 hunk FAILED -- saving rejects to file
> > drivers/staging/batman-adv/vis.h.rej
> > 
> > So, any thoughts?
> 
> I have currently no idea what you try to achieve by applying all patches out
> of order, but you have done following:
> 
>  * Staging: batman-adv: return -EFAULT on copy_to_user errors
>  * Staging: batman-adv: fix function prototype
>  * Staging: batman-adv: Mark locally used symbols as static
>    => of course fails because it was applied out of order and misses
>       9 patches inbetween

Ick, you are right, I had thought the 8 patches you sent me were the
ones that I should start with as I had already applied some of the
previous series.

So, to make it dirt-simple for me, so my simple mind can figure it out,
can you resend the patches that I need to apply that are not in my
staging-next tree?

thanks,

greg k-h
  
Sven Eckelmann June 21, 2010, 11:23 p.m. UTC | #2
Greg KH wrote:
> So, to make it dirt-simple for me, so my simple mind can figure it out,
> can you resend the patches that I need to apply that are not in my
> staging-next tree?

Yes, of course. I will sent them as response to this mail.

thanks,
	Sven
  
Greg KH June 22, 2010, 9:06 p.m. UTC | #3
On Tue, Jun 22, 2010 at 01:23:32AM +0200, Sven Eckelmann wrote:
> Greg KH wrote:
> > So, to make it dirt-simple for me, so my simple mind can figure it out,
> > can you resend the patches that I need to apply that are not in my
> > staging-next tree?
> 
> Yes, of course. I will sent them as response to this mail.

Thanks, I got them all and applied them.  Hopefully we should be all
synced up now, right?

So sorry for the confusion,

greg k-h
  
Sven Eckelmann June 22, 2010, 9:25 p.m. UTC | #4
On Tue, Jun 22, 2010 at 02:06:46PM -0700, Greg KH wrote:
> On Tue, Jun 22, 2010 at 01:23:32AM +0200, Sven Eckelmann wrote:
> > Greg KH wrote:
> > > So, to make it dirt-simple for me, so my simple mind can figure it out,
> > > can you resend the patches that I need to apply that are not in my
> > > staging-next tree?
> > 
> > Yes, of course. I will sent them as response to this mail.
> 
> Thanks, I got them all and applied them.  Hopefully we should be all
> synced up now, right?

The count seems to be correct - I have to check later if the content looks fine
too, but have not doubts that everything is fine.

I was asked to remind you about the mail regarding the possibility to move from
staging to net.

https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2010-June/002881.html

thanks,
	Sven
  
Greg KH June 22, 2010, 9:37 p.m. UTC | #5
On Tue, Jun 22, 2010 at 11:25:59PM +0200, Sven Eckelmann wrote:
> On Tue, Jun 22, 2010 at 02:06:46PM -0700, Greg KH wrote:
> > On Tue, Jun 22, 2010 at 01:23:32AM +0200, Sven Eckelmann wrote:
> > > Greg KH wrote:
> > > > So, to make it dirt-simple for me, so my simple mind can figure it out,
> > > > can you resend the patches that I need to apply that are not in my
> > > > staging-next tree?
> > > 
> > > Yes, of course. I will sent them as response to this mail.
> > 
> > Thanks, I got them all and applied them.  Hopefully we should be all
> > synced up now, right?
> 
> The count seems to be correct - I have to check later if the content looks fine
> too, but have not doubts that everything is fine.
> 
> I was asked to remind you about the mail regarding the possibility to move from
> staging to net.

Heh, yes, that's still in my queue, sorry, will go do that now...

thanks,

greg k-h
  

Patch

diff -ruN drivers/staging/batman-adv/hard-interface.c ../linux-next/drivers/staging/batman-adv/hard-interface.c
--- drivers/staging/batman-adv/hard-interface.c 2010-06-22 00:55:28.360018720 +0200
+++ ../linux-next/drivers/staging/batman-adv/hard-interface.c   2010-06-22 00:52:26.491518520 +0200
@@ -72,7 +72,7 @@ 
 #endif
 
        /* Device is being bridged */
-       /* if (net_dev->br_port != NULL)
+       /* if (net_dev->priv_flags & IFF_BRIDGE_PORT)
                return 0; */
 
        return 1;