On Tuesday 10 May 2016 09:00:49 Sven Eckelmann wrote:
On Monday 09 May 2016 21:06:08 Andrew Lunn wrote:
I hope this helps to reduce the conflicts (even when not resolving it completely) between the tp_meter and the netlink patchset.
Hi Sven
Do you want to take over my patches and merge them all into one set?
No, this is the last thing I want to do :)
I only want to get the "big" conflicts solved and mark the parts which most likely will needs to be changed before Marek will accept them.
I will have not much time in the next days to do any private work on it. So it most likely not the best idea to give me the patchset with a lot of TODOs in it ;)
I will try to poke Antonio and Marek some more so we get a common starting point (the two patches from batctl/batman-adv) which we then can use prepare our patchsets with a lot less conflicts.
Some reports which I forgot to mention yesterday and which I've just remembered:
bracket_align master ./net/batman-adv/bat_iv_ogm.c --------------------------------------------------
Found wrong alignment at ./net/batman-adv/bat_iv_ogm.c:2371, was 37 but expected 61 Found wrong alignment at ./net/batman-adv/bat_iv_ogm.c:2372, was 37 but expected 61
checkpatch master ./net/batman-adv/bat_v.c ------------------------------------------
CHECK: Please don't use multiple blank lines #450: FILE: ./net/batman-adv/bat_v.c:450: + +
total: 0 errors, 0 warnings, 1 checks, 732 lines checked
Kind regards, Sven