diff mbox series

[GIT,PULL] Device properties framework updates for v5.5-rc1

Message ID CAJZ5v0ih9pkWuMkDyKxG3rRnwELtNt+zz9JRudOgEAjS=XZawA@mail.gmail.com (mailing list archive)
State Mainlined, archived
Headers show
Series [GIT,PULL] Device properties framework updates for v5.5-rc1 | expand

Commit Message

Rafael J. Wysocki Nov. 26, 2019, 1:02 p.m. UTC
Hi Linus,

Please pull from the tag

 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git \
 devprop-5.5-rc1

with top-most commit 1afc14032e54a7e6c38304dc9a6bda1b6416f2b7

 software node: simplify property_entry_read_string_array()

on top of commit da0c9ea146cbe92b832f1b0f694840ea8eb33cce

 Linux 5.4-rc2

to receive device properties framework updates for 5.5-rc1.

These add support for printing fwnode names using a new conversion
specifier "%pfw" (Sakari Ailus), clean up the software node and
efi/apple-properties code in preparation for improved software node
reference properties handling (Dmitry Torokhov) and fix the struct
fwnode_operations description (Heikki Krogerus).

There is a merge conflict between this and the printk tree (affecting
checkpatch.pl) that has been addressed by the appended patch from
Stephen in linux-next.

Thanks!


---------------

Dmitry Torokhov (9):
      software node: remove DEV_PROP_MAX
      software node: introduce PROPERTY_ENTRY_XXX_ARRAY_LEN()
      efi/apple-properties: use PROPERTY_ENTRY_U8_ARRAY_LEN
      software node: mark internal macros with double underscores
      software node: clean up property_copy_string_array()
      software node: get rid of property_set_pointer()
      software node: remove property_entry_read_uNN_array functions
      software node: unify PROPERTY_ENTRY_XXX macros
      software node: simplify property_entry_read_string_array()

Heikki Krogerus (1):
      device property: Fix the description of struct fwnode_operations

Sakari Ailus (12):
      software node: Get reference to parent swnode in get_parent op
      software node: Make argument to to_software_node const
      device property: Move fwnode_get_parent() up
      device property: Add functions for accessing node's parents
      device property: Add fwnode_get_name for returning the name of a node
      device property: Add a function to obtain a node's prefix
      lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps
      lib/vsprintf: Add a note on re-using %pf or %pF
      lib/vsprintf: Make use of fwnode API to obtain node names and separators
      lib/vsprintf: OF nodes are first and foremost, struct device_nodes
      lib/vsprintf: Add %pfw conversion specifier for printing fwnode names
      lib/test_printf: Add tests for %pfw printk modifier

---------------

 Documentation/core-api/printk-formats.rst |  34 ++--
 drivers/acpi/property.c                   |  48 ++++++
 drivers/base/property.c                   |  83 +++++++++-
 drivers/base/swnode.c                     | 258 ++++++++++--------------------
 drivers/firmware/efi/apple-properties.c   |  18 +--
 drivers/of/property.c                     |  16 ++
 include/linux/fwnode.h                    |  10 +-
 include/linux/property.h                  | 106 ++++++------
 lib/test_printf.c                         |  32 ++++
 lib/vsprintf.c                            |  93 ++++++-----
 scripts/checkpatch.pl                     |   9 +-
 11 files changed, 414 insertions(+), 293 deletions(-)


---------------

+++ b/scripts/checkpatch.pl
@@@ -6019,10 -6020,13 +6020,13 @@@ sub process
                  my $fmt = get_quoted_string($lines[$count - 1],
raw_line($count, 0));
                  $fmt =~ s/%%//g;

-                 while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) {
+                 while ($fmt =~ /(\%[\*\d\.]*p(\w)(\w*))/g) {
                      $specifier = $1;
                      $extension = $2;
-                     if ($extension !~ /[SsBKRraEehMmIiUDdgVCbGNOxt]/) {
+                     $qualifier = $3;
 -                    if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxtf]/ ||
++                    if ($extension !~ /[SsBKRraEehMmIiUDdgVCbGNOxtf]/ ||
+                         ($extension eq "f" &&
+                          defined $qualifier && $qualifier !~ /^w/)) {
                          $bad_specifier = $specifier;
                          last;
                      }

Comments

pr-tracker-bot@kernel.org Nov. 27, 2019, 4:20 a.m. UTC | #1
The pull request you sent on Tue, 26 Nov 2019 14:02:03 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git devprop-5.5-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/361b0d286afea0d867537536977a695b5557d133

Thank you!
diff mbox series

Patch

diff --cc scripts/checkpatch.pl
index 4b40445938dc,3d1f08fa091c..000000000000
--- a/scripts/checkpatch.pl