On 07/04/2022 07:54, Christoph Hellwig wrote: > On Wed, Apr 06, 2022 at 08:00:24PM +0200, David Sterba wrote: >> I was able to resolve all the merge conflicts either manually or using >> the tool wiggle, no need to rebase. > > No problem. What branch should I use as baseline? for-next seems to > be merged from not otherwise visible branches so I'm not sure that is > a good baseline. > Most (if not all) btrfs development happens based on misc-next which is at https://github.com/kdave/btrfs-devel.git misc-next
