Re: [PATCH] ACPI: Replace HTTP links with HTTPS ones
Hi Alexander, Thanks for the patch. On Fri, Jul 17, 2020 at 08:24:36PM +0200, Alexander A. Klimov wrote: > Rationale: > Reduces attack surface on kernel devs opening the links for MITM > as HTTPS traffic is much harder to manipulate. > > Deterministic algorithm: > For each file: > If not .svg: > For each line: > If doesn't contain `\bxmlns\b`: > For each link, `\bhttp://[^# \t\r\n]*(?:\w|/)`: > If neither `\bgnu\.org/license`, nor `\bmozilla\.org/MPL\b`: > If both the HTTP and HTTPS versions > return 200 OK and serve the same content: > Replace HTTP with HTTPS. > > Signed-off-by: Alexander A. Klimov > --- > Continuing my work started at 93431e0607e5. > See also: git log --oneline '--author=Alexander A. Klimov > ' v5.7..master > > If there are any URLs to be removed completely or at least not just > HTTPSified: > Just clearly say so and I'll *undo my change*. > See also: https://lkml.org/lkml/2020/6/27/64 > > If there are any valid, but yet not changed URLs: > See: https://lkml.org/lkml/2020/6/26/837 > > If you apply the patch, please let me know. > > Sorry again to all maintainers who complained about subject lines. > Now I realized that you want an actually perfect prefixes, > not just subsystem ones. > I tried my best... > And yes, *I could* (at least half-)automate it. > Impossible is nothing! :) > > > .../firmware-guide/acpi/DSD-properties-rules.rst | 4 ++-- > .../firmware-guide/acpi/dsd/data-node-references.rst | 4 ++-- > Documentation/firmware-guide/acpi/dsd/graph.rst| 10 +----- > Documentation/firmware-guide/acpi/dsd/leds.rst | 6 +++--- For ACPI _DSD and data-node-references: Acked-by: Sakari Ailus -- Sakari Ailus ___ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-le...@lists.01.org
Re: [PATCH v2 1/1] treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively
Ping. On Tue, Mar 26, 2019 at 02:35:10PM +0100, Petr Mladek wrote: > Linus, > > On Mon 2019-03-25 21:32:28, Sakari Ailus wrote: > > %pF and %pf are functionally equivalent to %pS and %ps conversion > > specifiers. The former are deprecated, therefore switch the current users > > to use the preferred variant. > > > > The changes have been produced by the following command: > > > > git grep -l '%p[fF]' | grep -v '^\(tools\|Documentation\)/' | \ > > while read i; do perl -i -pe 's/%pf/%ps/g; s/%pF/%pS/g;' $i; done > > > > And verifying the result. > > I guess that the best timing for such tree-wide clean up is the end > of the merge window. Should we wait for 5.2 or is it still acceptable > to push this for 5.1-rc3? The patch still cleanly applies to linux-next as wells as Linus's tree. Some %pf bits have appeared and fixed since (include/trace/events/timer.h); the fix is in linux-next so once that and this patch are merged, there are no remaining %pf (or %pF) users left. The original patch: https://lore.kernel.org/lkml/tip-6849cbb0f9a8dbc1ba56e9abc6955613103e0...@git.kernel.org/> The fix: https://lore.kernel.org/lkml/20190321120921.16463-4-anna-ma...@linutronix.de/T/#u> > > The %pf/%pF modifiers are deprecated since the commit > 04b8eb7a4ccd9ef93 ("symbol lookup: introduce > dereference_symbol_descriptor()") in v4.16-rc1. > > Note that include/trace/events/timer.h is handled separately > in linux-next by > https://lkml.kernel.org/r/20190321120921.16463-4-anna-ma...@linutronix.de > > Or we could use v1 of this patch, see > https://lkml.kernel.org/r/20190322132108.25501-2-sakari.ai...@linux.intel.com > > > Signed-off-by: Sakari Ailus > > Acked-by: David Sterba (for btrfs) > > Acked-by: Mike Rapoport (for mm/memblock.c) > > Acked-by: Rafael J. Wysocki > > Reviewed-by: Petr Mladek Thank you! > > Best Regards, > Petr > > > --- > > I split this off from the set as there's a change in > > include/trace/events/timer.h that conflicts with v1 of this patch and > > should the second patch to be applied without that change, results into > > invalid use of %pf. To address the matter safely without conflicts or > > trying to print invalid pointer conversions, this patch and the other one > > changing include/trace/events/timer.h must be merged before second patch > > in v1 of this set can go in. > > > > since v1: > > > > - Drop such changes to include/trace/events/timer.h where %pf has already > > been converted to %ps in linux-next master. > > > > arch/alpha/kernel/pci_iommu.c | 20 ++-- > > arch/arm/mach-imx/pm-imx6.c | 2 +- > > arch/arm/mm/alignment.c | 2 +- > > arch/arm/nwfpe/fpmodule.c | 2 +- > > arch/microblaze/mm/pgtable.c| 2 +- > > arch/sparc/kernel/ds.c | 2 +- > > arch/um/kernel/sysrq.c | 2 +- > > arch/x86/include/asm/trace/exceptions.h | 2 +- > > arch/x86/kernel/irq_64.c| 2 +- > > arch/x86/mm/extable.c | 4 ++-- > > arch/x86/xen/multicalls.c | 2 +- > > drivers/acpi/device_pm.c| 2 +- > > drivers/base/power/main.c | 6 +++--- > > drivers/base/syscore.c | 12 ++-- > > drivers/block/drbd/drbd_receiver.c | 2 +- > > drivers/block/floppy.c | 10 +- > > drivers/cpufreq/cpufreq.c | 2 +- > > drivers/mmc/core/quirks.h | 2 +- > > drivers/nvdimm/bus.c| 2 +- > > drivers/nvdimm/dimm_devs.c | 2 +- > > drivers/pci/pci-driver.c| 14 +++--- > > drivers/pci/quirks.c| 4 ++-- > > drivers/pnp/quirks.c| 2 +- > > drivers/scsi/esp_scsi.c | 2 +- > > fs/btrfs/tests/free-space-tree-tests.c | 4 ++-- > > fs/f2fs/f2fs.h | 2 +- > > fs/pstore/inode.c | 2 +- > > include/trace/events/btrfs.h| 2 +- > > include/trace/events/cpuhp.h| 4 ++-- > > include/trace/events/preemptirq.h | 2 +- > > include/trace/events/rcu.h | 4 ++-- > > include/trace/events/sunrpc.h | 2 +- > > include/trace/events/vmscan.h | 4 ++-- > > include/trace/events/workqueue.h| 4 ++-- > > include/trace/events/xen.h | 2 +- > > init/main.c | 6 +++--- > > kernel/asyn
[PATCH v2 1/1] treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively
%pF and %pf are functionally equivalent to %pS and %ps conversion specifiers. The former are deprecated, therefore switch the current users to use the preferred variant. The changes have been produced by the following command: git grep -l '%p[fF]' | grep -v '^\(tools\|Documentation\)/' | \ while read i; do perl -i -pe 's/%pf/%ps/g; s/%pF/%pS/g;' $i; done And verifying the result. Signed-off-by: Sakari Ailus Acked-by: David Sterba (for btrfs) Acked-by: Mike Rapoport (for mm/memblock.c) Acked-by: Rafael J. Wysocki --- I split this off from the set as there's a change in include/trace/events/timer.h that conflicts with v1 of this patch and should the second patch to be applied without that change, results into invalid use of %pf. To address the matter safely without conflicts or trying to print invalid pointer conversions, this patch and the other one changing include/trace/events/timer.h must be merged before second patch in v1 of this set can go in. since v1: - Drop such changes to include/trace/events/timer.h where %pf has already been converted to %ps in linux-next master. arch/alpha/kernel/pci_iommu.c | 20 ++-- arch/arm/mach-imx/pm-imx6.c | 2 +- arch/arm/mm/alignment.c | 2 +- arch/arm/nwfpe/fpmodule.c | 2 +- arch/microblaze/mm/pgtable.c| 2 +- arch/sparc/kernel/ds.c | 2 +- arch/um/kernel/sysrq.c | 2 +- arch/x86/include/asm/trace/exceptions.h | 2 +- arch/x86/kernel/irq_64.c| 2 +- arch/x86/mm/extable.c | 4 ++-- arch/x86/xen/multicalls.c | 2 +- drivers/acpi/device_pm.c| 2 +- drivers/base/power/main.c | 6 +++--- drivers/base/syscore.c | 12 ++-- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/block/floppy.c | 10 +- drivers/cpufreq/cpufreq.c | 2 +- drivers/mmc/core/quirks.h | 2 +- drivers/nvdimm/bus.c| 2 +- drivers/nvdimm/dimm_devs.c | 2 +- drivers/pci/pci-driver.c| 14 +++--- drivers/pci/quirks.c| 4 ++-- drivers/pnp/quirks.c| 2 +- drivers/scsi/esp_scsi.c | 2 +- fs/btrfs/tests/free-space-tree-tests.c | 4 ++-- fs/f2fs/f2fs.h | 2 +- fs/pstore/inode.c | 2 +- include/trace/events/btrfs.h| 2 +- include/trace/events/cpuhp.h| 4 ++-- include/trace/events/preemptirq.h | 2 +- include/trace/events/rcu.h | 4 ++-- include/trace/events/sunrpc.h | 2 +- include/trace/events/vmscan.h | 4 ++-- include/trace/events/workqueue.h| 4 ++-- include/trace/events/xen.h | 2 +- init/main.c | 6 +++--- kernel/async.c | 4 ++-- kernel/events/uprobes.c | 2 +- kernel/fail_function.c | 2 +- kernel/irq/debugfs.c| 2 +- kernel/irq/handle.c | 2 +- kernel/irq/manage.c | 2 +- kernel/irq/spurious.c | 4 ++-- kernel/rcu/tree.c | 2 +- kernel/stop_machine.c | 2 +- kernel/time/sched_clock.c | 2 +- kernel/time/timer.c | 2 +- kernel/workqueue.c | 12 ++-- lib/error-inject.c | 2 +- lib/percpu-refcount.c | 4 ++-- mm/memblock.c | 12 ++-- mm/memory.c | 2 +- mm/vmscan.c | 2 +- net/ceph/osd_client.c | 2 +- net/core/net-procfs.c | 2 +- net/core/netpoll.c | 4 ++-- 56 files changed, 105 insertions(+), 105 deletions(-) diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 3034d6d936d2..242108439f42 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -249,7 +249,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) ok = 0; /* If both conditions above are met, we are fine. */ - DBGA("pci_dac_dma_supported %s from %pf\n", + DBGA("pci_dac_dma_supported %s from %ps\n", ok ? "yes" : "no", __builtin_return_address(0)); return ok; @@ -281,7 +281,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, && paddr + size <= __direct_map_size) { ret = paddr + __direct_map_base; - DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %pf\n", + DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %ps\n
Re: [PATCH 0/2] Remove support for deprecated %pf and %pF in vsprintf
Hi Andy, On Sun, Mar 24, 2019 at 11:19:32PM +0200, Andy Shevchenko wrote: > On Sun, Mar 24, 2019 at 11:10:08PM +0200, Sakari Ailus wrote: > > On Fri, Mar 22, 2019 at 07:05:50PM +0200, Andy Shevchenko wrote: > > > On Fri, Mar 22, 2019 at 03:53:50PM +0200, Sakari Ailus wrote: > > > > > > > Porting a patch > > > > forward should have no issues either as checkpatch.pl has been > > > > complaining > > > > of the use of %pf and %pF for a while now. > > > > > > And that's exactly the reason why I think instead of removing warning on > > > checkpatch, it makes sense to convert to an error for a while. People are > > > tending read documentation on internet and thus might have outdated one. > > > And > > > yes, the compiler doesn't tell a thing about it. > > > > > > P.S. Though, if majority of people will tell that I'm wrong, then it's > > > okay to > > > remove. > > > > I wonder if you wrote this before seeing my other patchset. > > Yes, I wrote it before seeing another series. > > > What I think could be done is to warn of plain %pf (without following "w") > > in checkpatch.pl, and %pf that is not followed by "w" in the kernel. > > Although we didn't have such checks to begin with. The case is still a > > little bit different as %pf used to be a valid conversion specifier whereas > > %pO likely has never existed. > > > > So, how about adding such checks in the other set? I can retain %p[fF] check > > here, too, if you like. > > Consistency tells me that the warning->error transformation in checkpatch.pl > belongs this series. All other invalid pointer conversion specifiers currently result into a warning only. I see that as an orthogonal change to this set. I found another issue in checkpatch.pl that may require some discussion; would you be ok with addressing this in another set? -- Regards, Sakari Ailus sakari.ai...@linux.intel.com ___ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH 0/2] Remove support for deprecated %pf and %pF in vsprintf
Hi Andy, On Fri, Mar 22, 2019 at 07:05:50PM +0200, Andy Shevchenko wrote: > On Fri, Mar 22, 2019 at 03:53:50PM +0200, Sakari Ailus wrote: > > > Porting a patch > > forward should have no issues either as checkpatch.pl has been complaining > > of the use of %pf and %pF for a while now. > > And that's exactly the reason why I think instead of removing warning on > checkpatch, it makes sense to convert to an error for a while. People are > tending read documentation on internet and thus might have outdated one. And > yes, the compiler doesn't tell a thing about it. > > P.S. Though, if majority of people will tell that I'm wrong, then it's okay to > remove. I wonder if you wrote this before seeing my other patchset. For others as the background, it adds %pfw to print fwnode node names. Assuming this would be merged, %pfw could be in use relatively soon. With the current patchset, %pf prints nothing just as %pO ("F" missing). What I think could be done is to warn of plain %pf (without following "w") in checkpatch.pl, and %pf that is not followed by "w" in the kernel. Although we didn't have such checks to begin with. The case is still a little bit different as %pf used to be a valid conversion specifier whereas %pO likely has never existed. So, how about adding such checks in the other set? I can retain %p[fF] check here, too, if you like. -- Kind regards, Sakari Ailus sakari.ai...@linux.intel.com ___ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH 0/2] Remove support for deprecated %pf and %pF in vsprintf
Hi Geert, On Fri, Mar 22, 2019 at 02:37:18PM +0100, Geert Uytterhoeven wrote: > Hi Sakari, > > On Fri, Mar 22, 2019 at 2:25 PM Sakari Ailus > wrote: > > The printk family of functions supports %ps and %pS conversion specifiers > > to print function names. Yet the deprecated %pf and %pF conversion > > specifiers with equivalent functionality remain supported. A number of > > users of %pf and %pF remain. > > > > This patchsets converts the existing users of %pf and %pF to %ps and %pS, > > respectively, and removes support for the deprecated %pf and %pF. > > > > The patches apply cleanly both on 5.1-rc1 as well as on Linux-next. No new > > %pf or %pF users have been added in the meantime so the patch is > > sufficient as itself on linux-next, too. > > Do you know in which commit they became deprecated, so the backporters > know how far this can be backported safely? That appears to be 04b8eb7a4ccd ("symbol lookup: introduce dereference_symbol_descriptor()"), the same patch that made %p[fF] and %p[sS] functionally equivalent. But my personal opinion would be not to backport the patch for two reasons: the sheer number of files it touches (those format strings change for various reasons) and the meager benefits it has on older kernels as any backported patch using %s or %S still works as such. Porting a patch forward should have no issues either as checkpatch.pl has been complaining of the use of %pf and %pF for a while now. -- Kind regards, Sakari Ailus sakari.ai...@linux.intel.com ___ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
[PATCH 2/2] vsprintf: Remove support for %pF and %pf in favour of %pS and %ps
%pS and %ps are now the preferred conversion specifiers to print function %names. The functionality is equivalent; remove the old, deprecated %pF %and %pf support. Signed-off-by: Sakari Ailus --- Documentation/core-api/printk-formats.rst | 10 -- lib/vsprintf.c| 8 ++-- scripts/checkpatch.pl | 5 - 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst index c37ec7cd9c06..c90826a1ff17 100644 --- a/Documentation/core-api/printk-formats.rst +++ b/Documentation/core-api/printk-formats.rst @@ -78,8 +78,6 @@ Symbols/Function Pointers %pS versatile_init+0x0/0x110 %ps versatile_init - %pF versatile_init+0x0/0x110 - %pf versatile_init %pSRversatile_init+0x9/0x110 (with __builtin_extract_return_addr() translation) %pB prev_fn_of_versatile_init+0x88/0x88 @@ -89,14 +87,6 @@ The ``S`` and ``s`` specifiers are used for printing a pointer in symbolic format. They result in the symbol name with (S) or without (s) offsets. If KALLSYMS are disabled then the symbol address is printed instead. -Note, that the ``F`` and ``f`` specifiers are identical to ``S`` (``s``) -and thus deprecated. We have ``F`` and ``f`` because on ia64, ppc64 and -parisc64 function pointers are indirect and, in fact, are function -descriptors, which require additional dereferencing before we can lookup -the symbol. As of now, ``S`` and ``s`` perform dereferencing on those -platforms (when needed), so ``F`` and ``f`` exist for compatibility -reasons only. - The ``B`` specifier results in the symbol name with offsets and should be used when printing stack backtraces. The specifier takes into consideration the effect of compiler optimisations which may occur diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 791b6fa36905..5f60b8d41277 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -797,7 +797,7 @@ char *symbol_string(char *buf, char *end, void *ptr, #ifdef CONFIG_KALLSYMS if (*fmt == 'B') sprint_backtrace(sym, value); - else if (*fmt != 'f' && *fmt != 's') + else if (*fmt != 's') sprint_symbol(sym, value); else sprint_symbol_no_offset(sym, value); @@ -1853,9 +1853,7 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, * * - 'S' For symbolic direct pointers (or function descriptors) with offset * - 's' For symbolic direct pointers (or function descriptors) without offset - * - 'F' Same as 'S' - * - 'f' Same as 's' - * - '[FfSs]R' as above with __builtin_extract_return_addr() translation + * - '[Ss]R' as above with __builtin_extract_return_addr() translation * - 'B' For backtraced symbolic direct pointers with offset * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref] * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201] @@ -1970,8 +1968,6 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, } switch (*fmt) { - case 'F': - case 'f': case 'S': case 's': ptr = dereference_symbol_descriptor(ptr); diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 5b756278df13..b4e456b48fd7 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -5993,11 +5993,6 @@ sub process { my $stat_real = get_stat_real($linenr, $lc); my $ext_type = "Invalid"; my $use = ""; - if ($bad_specifier =~ /p[Ff]/) { - $ext_type = "Deprecated"; - $use = " - use %pS instead"; - $use =~ s/pS/ps/ if ($bad_specifier =~ /pf/); - } WARN("VSPRINTF_POINTER_EXTENSION", "$ext_type vsprintf pointer extension '$bad_specifier'$use\n" . "$here\n$stat_real\n"); -- 2.11.0 ___ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
[PATCH 0/2] Remove support for deprecated %pf and %pF in vsprintf
Hi all, The printk family of functions supports %ps and %pS conversion specifiers to print function names. Yet the deprecated %pf and %pF conversion specifiers with equivalent functionality remain supported. A number of users of %pf and %pF remain. This patchsets converts the existing users of %pf and %pF to %ps and %pS, respectively, and removes support for the deprecated %pf and %pF. The patches apply cleanly both on 5.1-rc1 as well as on Linux-next. No new %pf or %pF users have been added in the meantime so the patch is sufficient as itself on linux-next, too. Sakari Ailus (2): treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively vsprintf: Remove support for %pF and %pf in favour of %pS and %ps Documentation/core-api/printk-formats.rst | 10 -- arch/alpha/kernel/pci_iommu.c | 20 ++-- arch/arm/mach-imx/pm-imx6.c | 2 +- arch/arm/mm/alignment.c | 2 +- arch/arm/nwfpe/fpmodule.c | 2 +- arch/microblaze/mm/pgtable.c | 2 +- arch/sparc/kernel/ds.c| 2 +- arch/um/kernel/sysrq.c| 2 +- arch/x86/include/asm/trace/exceptions.h | 2 +- arch/x86/kernel/irq_64.c | 2 +- arch/x86/mm/extable.c | 4 ++-- arch/x86/xen/multicalls.c | 2 +- drivers/acpi/device_pm.c | 2 +- drivers/base/power/main.c | 6 +++--- drivers/base/syscore.c| 12 ++-- drivers/block/drbd/drbd_receiver.c| 2 +- drivers/block/floppy.c| 10 +- drivers/cpufreq/cpufreq.c | 2 +- drivers/mmc/core/quirks.h | 2 +- drivers/nvdimm/bus.c | 2 +- drivers/nvdimm/dimm_devs.c| 2 +- drivers/pci/pci-driver.c | 14 +++--- drivers/pci/quirks.c | 4 ++-- drivers/pnp/quirks.c | 2 +- drivers/scsi/esp_scsi.c | 2 +- fs/btrfs/tests/free-space-tree-tests.c| 4 ++-- fs/f2fs/f2fs.h| 2 +- fs/pstore/inode.c | 2 +- include/trace/events/btrfs.h | 2 +- include/trace/events/cpuhp.h | 4 ++-- include/trace/events/preemptirq.h | 2 +- include/trace/events/rcu.h| 4 ++-- include/trace/events/sunrpc.h | 2 +- include/trace/events/timer.h | 8 include/trace/events/vmscan.h | 4 ++-- include/trace/events/workqueue.h | 4 ++-- include/trace/events/xen.h| 2 +- init/main.c | 6 +++--- kernel/async.c| 4 ++-- kernel/events/uprobes.c | 2 +- kernel/fail_function.c| 2 +- kernel/irq/debugfs.c | 2 +- kernel/irq/handle.c | 2 +- kernel/irq/manage.c | 2 +- kernel/irq/spurious.c | 4 ++-- kernel/rcu/tree.c | 2 +- kernel/stop_machine.c | 2 +- kernel/time/sched_clock.c | 2 +- kernel/time/timer.c | 2 +- kernel/workqueue.c| 12 ++-- lib/error-inject.c| 2 +- lib/percpu-refcount.c | 4 ++-- lib/vsprintf.c| 8 ++-- mm/memblock.c | 12 ++-- mm/memory.c | 2 +- mm/vmscan.c | 2 +- net/ceph/osd_client.c | 2 +- net/core/net-procfs.c | 2 +- net/core/netpoll.c| 4 ++-- scripts/checkpatch.pl | 5 - 60 files changed, 111 insertions(+), 130 deletions(-) -- 2.11.0 ___ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
[PATCH 1/2] treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively
%pF and %pf are functionally equivalent to %pS and %ps conversion specifiers. The former are deprecated, therefore switch the current users to use the preferred variant. The changes have been produced by the following command: git grep -l '%p[fF]' | grep -v '^\(tools\|Documentation\)/' | \ while read i; do perl -i -pe 's/%pf/%ps/g; s/%pF/%pS/g;' $i; done And verifying the result. Signed-off-by: Sakari Ailus --- arch/alpha/kernel/pci_iommu.c | 20 ++-- arch/arm/mach-imx/pm-imx6.c | 2 +- arch/arm/mm/alignment.c | 2 +- arch/arm/nwfpe/fpmodule.c | 2 +- arch/microblaze/mm/pgtable.c| 2 +- arch/sparc/kernel/ds.c | 2 +- arch/um/kernel/sysrq.c | 2 +- arch/x86/include/asm/trace/exceptions.h | 2 +- arch/x86/kernel/irq_64.c| 2 +- arch/x86/mm/extable.c | 4 ++-- arch/x86/xen/multicalls.c | 2 +- drivers/acpi/device_pm.c| 2 +- drivers/base/power/main.c | 6 +++--- drivers/base/syscore.c | 12 ++-- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/block/floppy.c | 10 +- drivers/cpufreq/cpufreq.c | 2 +- drivers/mmc/core/quirks.h | 2 +- drivers/nvdimm/bus.c| 2 +- drivers/nvdimm/dimm_devs.c | 2 +- drivers/pci/pci-driver.c| 14 +++--- drivers/pci/quirks.c| 4 ++-- drivers/pnp/quirks.c| 2 +- drivers/scsi/esp_scsi.c | 2 +- fs/btrfs/tests/free-space-tree-tests.c | 4 ++-- fs/f2fs/f2fs.h | 2 +- fs/pstore/inode.c | 2 +- include/trace/events/btrfs.h| 2 +- include/trace/events/cpuhp.h| 4 ++-- include/trace/events/preemptirq.h | 2 +- include/trace/events/rcu.h | 4 ++-- include/trace/events/sunrpc.h | 2 +- include/trace/events/timer.h| 8 include/trace/events/vmscan.h | 4 ++-- include/trace/events/workqueue.h| 4 ++-- include/trace/events/xen.h | 2 +- init/main.c | 6 +++--- kernel/async.c | 4 ++-- kernel/events/uprobes.c | 2 +- kernel/fail_function.c | 2 +- kernel/irq/debugfs.c| 2 +- kernel/irq/handle.c | 2 +- kernel/irq/manage.c | 2 +- kernel/irq/spurious.c | 4 ++-- kernel/rcu/tree.c | 2 +- kernel/stop_machine.c | 2 +- kernel/time/sched_clock.c | 2 +- kernel/time/timer.c | 2 +- kernel/workqueue.c | 12 ++-- lib/error-inject.c | 2 +- lib/percpu-refcount.c | 4 ++-- mm/memblock.c | 12 ++-- mm/memory.c | 2 +- mm/vmscan.c | 2 +- net/ceph/osd_client.c | 2 +- net/core/net-procfs.c | 2 +- net/core/netpoll.c | 4 ++-- 57 files changed, 109 insertions(+), 109 deletions(-) diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 3034d6d936d2..242108439f42 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -249,7 +249,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) ok = 0; /* If both conditions above are met, we are fine. */ - DBGA("pci_dac_dma_supported %s from %pf\n", + DBGA("pci_dac_dma_supported %s from %ps\n", ok ? "yes" : "no", __builtin_return_address(0)); return ok; @@ -281,7 +281,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, && paddr + size <= __direct_map_size) { ret = paddr + __direct_map_base; - DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %pf\n", + DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %ps\n", cpu_addr, size, ret, __builtin_return_address(0)); return ret; @@ -292,7 +292,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, if (dac_allowed) { ret = paddr + alpha_mv.pci_dac_offset; - DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %pf\n", + DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %ps\n", cpu_addr, size, ret, __builtin_return_address(0)); return ret; @@ -329,7 +329,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,