If the current (unsquashed) commits have nothing to do with the patches you want to receive, just keep doing as per your pattern.
Personally, I would create a "for-upstream" branch and cherry pick some commits there (and split or edit them if necessary), but this requires similar resources, for example, using your path.
source
share