From: Remi Lespinet Date: Tue, 09 Jun 2015 17:56:20 GMT Subject: [PATCH 0/7] changes from last version Message-ID: <1433872587-15515-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> CHANGES (since last submitted version) 1/7 : identical to previous 1/5 2/7 : identical to previous 2/5 3/7 : identical to previous 3/5 4/7 : Modification previously done by 5/5 (refactoring address process) 5/7 : identical modulo a minor change at hunk @@ -1023,8 +1009,13 @@ in the function process_address_list due to 4/7 6/7 : new commit 7/7 : new commit CONFLICT (if merging to pu) There will be a trivial conflict if merging to pu (with 514554cf, 3169e06d and 6be02640 from Eric Sunshine and Allen Hubbe patch series). Suppressing conflict marks resolve it.