Hi all,
Today's linux-next merge of the s390 tree got a conflict in
arch/s390/pci/pci_debug.c between commit c2f0b61d8969 ("s390: remove
use of seq_printf return value") from Linus' tree and commit
80ed156a3d12 ("s390/pci: add locking for fmb access") from the s390
tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc arch/s390/pci/pci_debug.c index c22d4402ae45,3fc9b4d90b59..000000000000 --- a/arch/s390/pci/pci_debug.c +++ b/arch/s390/pci/pci_debug.c @@@ -45,9 -58,11 +58,12 @@@ static int pci_perf_show(struct seq_fil if (!zdev) return 0; + + mutex_lock(&zdev->lock); if (!zdev->fmb) { + mutex_unlock(&zdev->lock); - return seq_printf(m, "FMB statistics disabled\n"); + seq_puts(m, "FMB statistics disabled\n"); + return 0; } /* header */
pgpdfPHf6qqeb.pgp
Description: OpenPGP digital signature
