> > - A single git reset ORIG_HEAD recovers from a conflicting merge > > handling conflicts is a big part of a maintainer's job!
Because you are a driver maintainer. That's what's different here from regular merge. Please understand: we have upstream code and we have changes against it. Upstream code is golden. If some patch conflicts with it, it is always this patch that needs to be fixed. And I want to ability to bounce that job to patch author - I simply do not know enough about e.g. ehca. > also, if the upstream > changes touch code that conflicts with a backport > patch, you get to fix the problem as it happens That's exactly the thing that I do not want to do. -- MST _______________________________________________ ewg mailing list ewg@lists.openfabrics.org http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg