Hi,
here are patches targeted for 2.6.36. All patches needed for that patchset are
already part of Linus' tree. They are smaller bugfixes and add no new features.
The only special fix is "unify orig_hash_lock spinlock handling to avoid
deadlocks" which fixes the usage of the same spinlock with spin_lock and
spin_lock_irqsave. This one should also be applied in 2.6.35.x
"Fix merge of linus tree" should readd an older bugfix again which was removed
by your merge with Linus' tree.
The patches for 2.6.37 will follow later.
thanks,
Sven
Marek Lindner (4):
Staging: batman-adv: unify orig_hash_lock spinlock handling to avoid
deadlocks
Staging: batman-adv: fix batman icmp originating from secondary interface
Staging: batman-adv: always reply batman icmp packets with primary mac
Staging: batman-adv: fix own mac address detection
Sven Eckelmann (1):
Staging: batman-adv: Fix merge of linus tree
drivers/staging/batman-adv/bat_sysfs.c | 4 ++++
drivers/staging/batman-adv/hard-interface.c | 8 --------
drivers/staging/batman-adv/icmp_socket.c | 12 ++++++++----
drivers/staging/batman-adv/main.c | 7 +++++--
drivers/staging/batman-adv/originator.c | 14 ++++++++------
drivers/staging/batman-adv/routing.c | 16 ++++++++++++++--
drivers/staging/batman-adv/types.h | 1 +
7 files changed, 40 insertions(+), 22 deletions(-)
