From: Sven Eckelmann <sven.eckelmann@gmx.de>
To: Greg KH <greg@kroah.com>
Cc: b.a.t.m.a.n@lists.open-mesh.net
Subject: Re: [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (2)
Date: Tue, 22 Jun 2010 00:59:47 +0200 [thread overview]
Message-ID: <201006220059.48628.sven.eckelmann@gmx.de> (raw)
In-Reply-To: <20100621223427.GA22687@kroah.com>
[-- Attachment #1: Type: Text/Plain, Size: 9399 bytes --]
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:
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;
So I would say that everything should work as expected.
Best regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2010-06-21 22:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-19 0:51 [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (2) Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 1/8] Staging: batman-adv: Mark locally used symbols as static Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 2/8] Staging: batman-adv: Ignore debugfs on kernels without debugfs support Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 3/8] Staging: batman-adv: permit setting ogm interval to JITTER*2 Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 4/8] Staging: batman-adv: Add release information for version 2010.0.0 Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 5/8] Staging: batman-adv: 32bit sequence number and TTL for broadcasts Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 6/8] Staging: batman-adv: Add bonding functionality Sven Eckelmann
2010-06-21 9:04 ` Sven Eckelmann
2010-06-21 10:38 ` Marek Lindner
2010-06-21 10:57 ` Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 7/8] Staging: batman-adv: bonding and interface alternating Sven Eckelmann
2010-06-19 0:51 ` [B.A.T.M.A.N.] [PATCH 8/8] Staging: batman-adv: record route for ICMP messages Sven Eckelmann
2010-06-21 22:34 ` [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (2) Greg KH
2010-06-21 22:59 ` Sven Eckelmann [this message]
2010-06-21 23:16 ` Greg KH
2010-06-21 23:23 ` Sven Eckelmann
2010-06-22 21:06 ` Greg KH
2010-06-22 21:25 ` Sven Eckelmann
2010-06-22 21:37 ` Greg KH
2010-06-25 22:28 Sven Eckelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201006220059.48628.sven.eckelmann@gmx.de \
--to=sven.eckelmann@gmx.de \
--cc=b.a.t.m.a.n@lists.open-mesh.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=greg@kroah.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).