From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Petr Mladek <pmladek@suse•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Tobin C. Harding" <me@tobin•cc>,
Sergey Senozhatsky <sergey.senozhatsky@gmail•com>,
Joe Perches <joe@perches•com>
Subject: Re: linux-next: manual merge of the printk tree with Linus' tree
Date: Tue, 16 Jan 2018 11:04:09 +0900 [thread overview]
Message-ID: <20180116020409.GB6607@jagdpanzerIV> (raw)
In-Reply-To: <20180116092319.1575cac0@canb.auug.org.au>
On (01/16/18 09:23), Stephen Rothwell wrote:
> Today's linux-next merge of the printk tree got a conflict in:
>
> scripts/checkpatch.pl
>
> between commit:
>
> 7b1924a1d930 ("vsprintf: add printk specifier %px")
>
> from Linus' tree and commit:
>
> 1df7338ac965 ("checkpatch: add pF/pf deprecation warning")
>
> from the printk tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
looks correct to me. thanks.
-ss
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc scripts/checkpatch.pl
> index 31031f10fe56,0bb68e7ff173..000000000000
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@@ -5753,7 -5753,7 +5753,7 @@@ sub process
> for (my $count = $linenr; $count <= $lc; $count++) {
> my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
> $fmt =~ s/%%//g;
> - if ($fmt =~ /(\%[\*\d\.]*p(?![\WFfSsBKRraEhMmIiUDdgVCbGNOx]).)/) {
> - if ($fmt =~ /(\%[\*\d\.]*p(?![\WSsBKRraEhMmIiUDdgVCbGNO]).)/) {
> ++ if ($fmt =~ /(\%[\*\d\.]*p(?![\WSsBKRraEhMmIiUDdgVCbGNOx]).)/) {
> $bad_extension = $1;
> last;
> }
>
next prev parent reply other threads:[~2018-01-16 2:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 22:23 linux-next: manual merge of the printk tree with Linus' tree Stephen Rothwell
2018-01-16 2:04 ` Sergey Senozhatsky [this message]
2018-01-16 10:38 ` Petr Mladek
-- strict thread matches above, loose matches on Subject: below --
2018-05-23 22:37 Mark Brown
2019-04-09 23:24 Stephen Rothwell
2019-04-09 23:29 Stephen Rothwell
2019-04-09 23:34 Stephen Rothwell
2024-05-29 1:28 Stephen Rothwell
2024-05-29 1:31 Stephen Rothwell
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=20180116020409.GB6607@jagdpanzerIV \
--to=sergey.senozhatsky.work@gmail$(echo .)com \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=me@tobin$(echo .)cc \
--cc=pmladek@suse$(echo .)com \
--cc=sergey.senozhatsky@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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