Conversation
jarkko

Jarkko Sakkinen

This is what I've ended up with when managing patches for two subsystems in a single repo after time has passed and a few (reasonable) complaints from Linus:

❯ git log --oneline mainline/master..
be5f7a96c705 (HEAD -> master, origin/master, origin/for-next-tpm, origin/HEAD, for-next-tpm) tpm: tpm2-sessions: wait for async KPP completion in tpm_buf_append_salt
3253b2d6a105 tpm: tpm_tis: Add settle time for some TPMs
ad7d5669c730 tpm: tpm_tis: store entire did_vid
bca6affd1984 tpm_crb: Check ACPI_COMPANION() against NULL during probe
5923548fee74 tpm: tpm_tis_spi: Use wait_woken() in wait_for_tmp_stat()
daaafcaed71f tpm: Initialize name_size_alg for non-NULL name in tpm_buf_append_name()
243622766158 tpm: restore timeout for key creation commands
bd4ea087cece tpm: svsm: constify tpm_chip_ops
c878751af7b3 (origin/for-next-keys, for-next-keys) keys/trusted_keys: mark 'migratable' as __ro_after_init
e41b301271e9 keys: use kmalloc_flex in user_preparse
5720aae49352 KEYS: trusted: Debugging as a feature
227ea2f88f71 KEYS: encrypted: Remove unnecessary selection of CRYPTO_RNG
d1cc4490172a KEYS: fix overflow in keyctl_pkey_params_get_2()

Nothing fancy. It's in PR order basically. And usually prioritizing keyring PR makes sense because of wider and platform agnostic exposure.
0
0
0
About social.kernel.org

Terms of service

  1. Please do not use this service in violation of the Linux Kernel Code of Conduct. Doing so will result in your account suspension with the referral of the matter to the CoC committee.

  2. "Repeating"/"boosting" someone else's status on this platform will be treated as endorsement and will fall under rule #1.

  3. You are encouraged to use this platform to promote your work on the Linux Kernel, but there is no restriction on permitted topics (with the exception of anything covered by #1 above).

  4. There is no requirement to post in English, but it should be considered the primary language of communication on this platform.

Privacy notice

The admins of this service have access to all posted statuses. They aren't looking, but if it's something they shouldn't know about, then you should not post it on this platform.

Please see the Linux Foundation Privacy Policy, which applies to this platform as well.

Getting your own account

If you would like an account on this instance, please check that the following applies to you:

  • You are listed in MAINTAINERS or CREDITS

  • OR: You have a kernel.org account or email address

  • OR: You have a long and established history of involvement with the Linux Kernel

If the above is true and you agree with the Terms of Service and Privacy Notice listed above, please use these instructions to request an account: