Comment 4 for bug 1659039

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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.