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 [email protected] :
>
> * 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
