I am going to resubmit this patch series in a moment.
I will, by the book, call it v5, but the only change is adjusting to a conflict 
in a trivial way:

$ git range-diff '@{upstream}@{1}~4..@{upstream}@{1}' HEAD~4..HEAD
1:  62c5a5bf430 = 1:  b4c414b7424 find_a_program: Separate from find_a_file
2:  45e2239c2a3 = 2:  4ddff82999f driver: Simplify `find_a_program` and 
`find_a_file`
3:  11428e3d1a6 ! 3:  edc7c12078b for_each_path: Pass to callback whether dir 
is machine-disambiguated
    @@ gcc/gcc.cc: for_each_path (const struct path_prefix *paths,
        const char *multi_suffix;
        const char *just_multi_suffix;
        char *path = NULL;
    --  decltype (callback (nullptr)) ret;
    -+  decltype (callback (nullptr, false)) ret;
    +-  decltype (callback (nullptr)) ret = nullptr;
    ++  decltype (callback (nullptr, false)) ret = nullptr;
        bool skip_multi_dir = false;
        bool skip_multi_os_dir = false;

4:  8f54485fe28 = 4:  1813b6f8d8a find_a_program: Search with machine prefix in 
some cases

(And that conflict was fixing my mistake in an earlier, landed patch.)

Cheers,

John

Reply via email to