From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=sbjL=YL=vger.kernel.org=linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 80C50CA9EA1
	for <linux-next@archiver.kernel.org>; Fri, 18 Oct 2019 09:34:11 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 5FBFC21852
	for <linux-next@archiver.kernel.org>; Fri, 18 Oct 2019 09:34:11 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2442241AbfJRJeK (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Fri, 18 Oct 2019 05:34:10 -0400
Received: from cloudserver094114.home.pl ([79.96.170.134]:49773 "EHLO
        cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728507AbfJRJeK (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Fri, 18 Oct 2019 05:34:10 -0400
Received: from 79.184.255.51.ipv4.supernova.orange.pl (79.184.255.51) (HELO kreacher.localnet)
 by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.292)
 id 10524a0729761fd6; Fri, 18 Oct 2019 11:34:08 +0200
From:   "Rafael J. Wysocki" <rjw@rjwysocki.net>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Sakari Ailus <sakari.ailus@linux.intel.com>
Cc:     Petr Mladek <pmladek@suse.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Rasmus Villemoes <linux@rasmusvillemoes.dk>
Subject: Re: linux-next: manual merge of the pm tree with the printk tree
Date:   Fri, 18 Oct 2019 11:34:08 +0200
Message-ID: <2158297.kSde27ogMe@kreacher>
In-Reply-To: <20191018101938.0947d0b2@canb.auug.org.au>
References: <20191018101938.0947d0b2@canb.auug.org.au>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Sender: linux-next-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On Friday, October 18, 2019 1:19:38 AM CEST Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   lib/test_printf.c
> 
> between commit:
> 
>   57f5677e535b ("printf: add support for printing symbolic error names")
> 
> from the printk tree and commit:
> 
>   f1ce39df508d ("lib/test_printf: Add tests for %pfw printk modifier")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. 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.

The resolution looks good to me, thank you!

Sakari, please double check.