linux-kernel - Re: linux-next: manual merge of the pm tree with the printk tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 18 Oct 2019 12:45:07 +0300
From:   Sakari Ailus <sakari.ailus@...ux.intel.com>
To:     "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Petr Mladek <pmladek@...e.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Rasmus Villemoes <linux@...musvillemoes.dk>
Subject: Re: linux-next: manual merge of the pm tree with the printk tree

On Fri, Oct 18, 2019 at 11:34:08AM +0200, Rafael J. Wysocki wrote:
> 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.

Yes, it's fine.

Thanks.

-- 
Sakari Ailus