On 1/20/23 12:42 PM, Jason Gunthorpe wrote: > On Fri, Jan 20, 2023 at 07:09:43PM +0200, Leon Romanovsky wrote: > >> Backmerge will cause to the situation where features are brought to -rc. >> The cherry-pick will be: >> 1. Revert [PATCH for-next 2/7] IB/hfi1: Assign npages earlier] from -next >> 2. Apply [PATCH for-next 2/7] IB/hfi1: Assign npages earlier] to -rc > > You don't need to revert, we just need to merge a RC release to -next > and deal with the conflict, if any. Thanks this sounds like a good way to go. -Denny