From: Greg KH <greg@kroah.com>
To: Sven Eckelmann <sven.eckelmann@gmx.de>
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: Mon, 21 Jun 2010 15:34:27 -0700 [thread overview]
Message-ID: <20100621223427.GA22687@kroah.com> (raw)
In-Reply-To: <1276908713-28365-1-git-send-email-sven.eckelmann@gmx.de>
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?
confused,
greg k-h
next prev parent reply other threads:[~2010-06-21 22:34 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 ` Greg KH [this message]
2010-06-21 22:59 ` [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (2) Sven Eckelmann
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
-- strict thread matches above, loose matches on Subject: below --
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=20100621223427.GA22687@kroah.com \
--to=greg@kroah.com \
--cc=b.a.t.m.a.n@lists.open-mesh.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=sven.eckelmann@gmx.de \
/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