Re: [PATCH v3 0/6] Apple M1 (Pro/Max) NVMe driver

From: hch@xxxxxx
Date: Thu Apr 28 2022 - 10:24:20 EST


On Wed, Apr 27, 2022 at 07:39:49PM +0200, Arnd Bergmann wrote:
> The usual trick is to have a branch with the shared patches and have
> that pulled into every other tree that needs these, but make sure you never
> rebase. In this case, you could have something like
>
> a) rtkit driver in a shared branch (private only)
> b) thunderbolt driver based on branch a), merged through
> thunderbolt/usb/pci tree (I don't know who is responsible here)
> c) sart driver based on branch a), merged through soc tree
> d) nvme driver based on branch c), merged through nvme tree
>
> since the commit hashes are all identical, each patch only shows up in
> the git tree once, but you get a somewhat funny history.

Given that the nvme driver is just addition of new code I'm perfectly
fine with sending it through whatever tree is most convenient.