On Thu, Jan 26, 2023 at 03:45:14PM +0000, Jarkko Sakkinen wrote: > On Mon, Jan 23, 2023 at 08:11:40AM +1100, Stephen Rothwell wrote: > > Hi all, > > > > The following commits are also in Linus Torvalds' tree as different > > commits (but the same patches): > > > > 07e8ac925f39 ("xfs: fix off-by-one error in xfs_btree_space_to_height") > > 3f5948c5cbb6 ("xfs: xfs_qm: remove unnecessary ‘0’ values from error") > > 42131102fd2b ("xfs: make xfs_iomap_page_ops static") > > 650db86fa92e ("xfs: get root inode correctly at bulkstat") > > 81e251490768 ("xfs: fix extent busy updating") > > 8c06bf34e6a4 ("Linux 6.2-rc3") > > 9b56a9ba5a17 ("xfs: Fix deadlock on xfs_inodegc_worker") > > b8314b7eee32 ("xfs: don't assert if cmap covers imap after cycling lock") > > cb714cbd5150 ("powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT") > > d48aa1d1fa3e ("powerpc/vmlinux.lds: Don't discard .comment") > > ed70c7b3cd7e ("powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds") > > > > This is clearly caused by a bad rebase of the tpmdd tree :-( > > > > -- > > Cheers, > > Stephen Rothwell > > Thanks I'll fix it. $ git log --oneline mainline/master..next 9e01d7dc0796 (HEAD -> next, origin/next, origin/master, origin/HEAD, master) tpm: tis_i2c: Convert to i2c's .probe_new() d5c71a221b6b tpm: tpm_i2c_nuvoton: Convert to i2c's .probe_new() 3b68fc8c0e81 tpm: tpm_i2c_infineon: Convert to i2c's .probe_new() 3e39b1972330 tpm: tpm_i2c_atmel: Convert to i2c's .probe_new() 0bb7bb8f84f8 tpm: st33zp24: Convert to i2c's .probe_new() 65b5c7776242 KEYS: asymmetric: Fix ECDSA use via keyctl uapi 8a1719d664fb certs: don't try to update blacklist keys 6e7dadceca39 KEYS: Add new function key_create() b4c45ccd5fcb certs: make blacklisted hash available in klog 8f00541caf05 tpm_crb: Add support for CRB devices based on Pluton 9257ac926329 crypto: certs: fix FIPS selftest dependency BR, Jarkko