Re: [Wireshark-dev] How do I create a merge request for changes to get into the next 3.6.x release

2021-12-15 Thread Guy Harris
On Dec 15, 2021, at 10:30 PM, Guy Harris wrote: > If the cherry-pick cannot be done automatically, you'll have to do it by > hand, in a tree checked out with the release-3.6 branch. Do the cherry pick > - if you're doing it from the command line, do it with "git cherry-pick -x" > to include t

Re: [Wireshark-dev] How do I create a merge request for changes to get into the next 3.6.x release

2021-12-15 Thread Guy Harris
On Dec 15, 2021, at 9:05 PM, Richard Sharpe wrote: > I have submitted merge requests to fix some problems with the S1G > radiotap changes and would like to ensure they get into the next 3.6.x > release because there are now chipsets and adapters shipping with S1G > (Halow) support. > > So, what

[Wireshark-dev] How do I create a merge request for changes to get into the next 3.6.x release

2021-12-15 Thread Richard Sharpe
Hi folks, I have submitted merge requests to fix some problems with the S1G radiotap changes and would like to ensure they get into the next 3.6.x release because there are now chipsets and adapters shipping with S1G (Halow) support. So, what sort of merge requests do I need to create? -- Regar