From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"Petr Mladek" <pmladek@suse.com>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: Re: linux-next: manual merge of the pm tree with the printk tree
Date: Mon, 18 Nov 2019 14:45:26 +0200 [thread overview]
Message-ID: <20191118124526.GD5391@paasikivi.fi.intel.com> (raw)
In-Reply-To: <2126744.rv85diC2z5@kreacher>
On Fri, Nov 15, 2019 at 11:46:53AM +0100, Rafael J. Wysocki wrote:
> On Friday, November 15, 2019 1:05:00 AM CET Stephen Rothwell wrote:
> >
> > --Sig_/8dHD0qGh0F9UnYxbYqUlngQ
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi all,
> >
> > Today's linux-next merge of the pm tree got a conflict in:
> >
> > scripts/checkpatch.pl
> >
> > between commit:
> >
> > 1d28122131b2 ("checkpatch: don't warn about new vsprintf pointer extensio=
> > n '%pe'")
> >
> > from the printk tree and commit:
> >
> > 3bd32d6a2ee6 ("lib/vsprintf: Add %pfw conversion specifier for printing f=
> > wnode names")
> >
> > from the pm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> Thanks, and it looks good to me.
The change seems fine to me as well.
Thanks.
--
Sakari Ailus
next prev parent reply other threads:[~2019-11-18 12:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 0:05 linux-next: manual merge of the pm tree with the printk tree Stephen Rothwell
2019-11-15 10:46 ` Rafael J. Wysocki
2019-11-18 12:45 ` Sakari Ailus [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-10-17 23:19 Stephen Rothwell
2019-10-18 9:34 ` Rafael J. Wysocki
2019-10-18 9:45 ` Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191118124526.GD5391@paasikivi.fi.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).