Re: git MFC/cherry-pick question

2021-06-03 Thread Warner Losh
On Thu, Jun 3, 2021 at 8:29 PM Alan Somers wrote: > On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem wrote: > > > Hi, > > > > I am trying to MFC a commit to stable/12. > > The cherry-pick works, but the resultant code > > is not correct and won't build. > > --> I broke the build yesterday and

Re: git MFC/cherry-pick question

2021-06-03 Thread Alan Somers
On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem wrote: > Hi, > > I am trying to MFC a commit to stable/12. > The cherry-pick works, but the resultant code > is not correct and won't build. > --> I broke the build yesterday and manually >reverted the breakage. > > So, how do I do this? > > Do

git MFC/cherry-pick question

2021-06-03 Thread Rick Macklem
Hi, I am trying to MFC a commit to stable/12. The cherry-pick works, but the resultant code is not correct and won't build. --> I broke the build yesterday and manually reverted the breakage. So, how do I do this? Do I have to manually edit the file after the cherry-pick and then do