ACK/Cmnt: [PATCH 0/1][SRU][B][C] mac80211_hwsim: Timer should be initialized before device registered

[You-Sheng Yang]

On 2019/4/18 5:59 PM, Stefan Bader wrote:
> On 17.04.19 10:31, You-Sheng Yang wrote:
>> Vasyl Vavrychuk (1):
>>   mac80211_hwsim: Timer should be initialized before device registered
>>
>>  drivers/net/wireless/mac80211_hwsim.c | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
> Is this really the same patch for Bionic and Cosmic? If so, then just send it
> once with [SRU][B][C] (or [SRU B/C]) markup. If not, please change cherry picked
> to backported. Except when git am -C2 works and ends up changing the right
> places. Then still only send one patch but note in the cover email that there
> are context differences to be ignored. Thanks.

`git cherry-pick a1881c9b8a` works on B & C, but the generated patch
cannot be applied to the other's tree cleanly due to the context below
the modified lines.

`git am -C2 ...` doesn't work, but `git am -C1` does. I was not aware we
can take advantage of that -C<n> flag to reuse a conflicting patch and
will follow next time this scenario applies.

You-Sheng Yang

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20190419/d13fc866/attachment-0001.sig>