On Sunday, May 31, 2015 10:10:21 Sven Eckelmann wrote: > The Linux CodingStyle disallows multiple assignments in a single line. > (see chapter 1) > > Reported-by: Markus Pargmann <[email protected]> > Signed-off-by: Sven Eckelmann <[email protected]> > --- > net/batman-adv/bat_iv_ogm.c | 6 ++++-- > net/batman-adv/bridge_loop_avoidance.c | 6 ++++-- > net/batman-adv/distributed-arp-table.c | 3 ++- > net/batman-adv/gateway_client.c | 15 ++++++++++----- > net/batman-adv/gateway_common.c | 5 ++++- > net/batman-adv/network-coding.c | 3 ++- > net/batman-adv/translation-table.c | 18 +++++++++++++----- > 7 files changed, 39 insertions(+), 17 deletions(-)
Tried to merge this patch but it greeted me with extensive complaints: patching file net/batman-adv/bat_iv_ogm.c Hunk #1 succeeded at 1004 (offset -2 lines). Hunk #2 succeeded at 1405 (offset -2 lines). patching file net/batman-adv/bridge_loop_avoidance.c Hunk #1 succeeded at 88 (offset -1 lines). Hunk #2 succeeded at 106 (offset -1 lines). patching file net/batman-adv/distributed-arp-table.c patching file net/batman-adv/gateway_client.c Hunk #1 FAILED at 153. Hunk #3 FAILED at 352. 2 out of 4 hunks FAILED -- saving rejects to file net/batman-adv/gateway_client.c.rej patching file net/batman-adv/gateway_common.c Hunk #1 FAILED at 149. 1 out of 1 hunk FAILED -- saving rejects to file net/batman-adv/gateway_common.c.rej patching file net/batman-adv/network-coding.c Hunk #1 succeeded at 886 (offset -1 lines). patching file net/batman-adv/translation-table.c Hunk #1 FAILED at 461. Hunk #2 FAILED at 535. Hunk #3 FAILED at 723. Hunk #4 FAILED at 796. Hunk #5 FAILED at 853. 5 out of 5 hunks FAILED -- saving rejects to file net/batman-adv/translation-table.c.rej Maybe I messed up the patch merge order ? Do you mind resending a 'clean' version ? Thanks, Marek
signature.asc
Description: This is a digitally signed message part.
