If you want to start on this one to help you a bit more for complex merges I'd highly recommend (in fact I use it even for trivial ones) to follow https://wiki.ubuntu.com/UbuntuDevelopment/Merging/GitWorkflow
Seems somewhat doable: git diff old/debian | diffstat changelog | 58 ++++++++ control | 4 iproute2.install | 1 patches/1000-ubuntu-poc-fan-driver.patch | 65 +++++++++ patches/1001-ubuntu-poc-fan-driver-v3.patch | 133 ++++++++++++++++++ patches/1002-ubuntu-poc-fan-driver-vxlan.patch | 177 +++++++++++++++++++++++++ patches/1003-fix-variable-in-libnetlink.patch | 53 +++++++ patches/series | 4 8 files changed, 494 insertions(+), 1 deletion(-) That helps you doing the merge as well as the reviewer of your work. Thanks for your suggestion to volunteer for the Community! Since major Delta seems to be for the https://wiki.ubuntu.com/FanNetworking you might want to get some help from the Kernel Team once you have something to test. -- You received this bug notification because you are a member of Ubuntu Touch seeded packages, which is subscribed to iproute2 in Ubuntu. https://bugs.launchpad.net/bugs/1659039 Title: iproute2 catch up with upstream Status in iproute2 package in Ubuntu: New Bug description: https://answers.launchpad.net/ubuntu/+source/iproute2/+question/445831 also tons of bugfixes: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/log/ To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/iproute2/+bug/1659039/+subscriptions -- Mailing list: https://launchpad.net/~touch-packages Post to : touch-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~touch-packages More help : https://help.launchpad.net/ListHelp
