From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Petr Mladek <pmladek@suse•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Sakari Ailus <sakari.ailus@linux•intel.com>,
Mike Rapoport <rppt@linux•ibm.com>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the printk tree with Linus' tree
Date: Wed, 10 Apr 2019 09:34:29 +1000 [thread overview]
Message-ID: <20190410093429.095c8975@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 800 bytes --]
Hi all,
Today's linux-next merge of the printk tree got a conflict in:
mm/memblock.c
between commit:
26fb3dae0a1e ("memblock: drop memblock_alloc_*_nopanic() variants")
from Linus' tree and commit:
d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively")
from the printk tree.
I fixed it up (the former removed the code changed by part of the latter)
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-04-09 23:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 23:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-29 1:31 linux-next: manual merge of the printk tree with Linus' tree Stephen Rothwell
2024-05-29 1:28 Stephen Rothwell
2019-04-09 23:29 Stephen Rothwell
2019-04-09 23:24 Stephen Rothwell
2018-05-23 22:37 Mark Brown
2018-01-15 22:23 Stephen Rothwell
2018-01-16 2:04 ` Sergey Senozhatsky
2018-01-16 10:38 ` Petr Mladek
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=20190410093429.095c8975@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pmladek@suse$(echo .)com \
--cc=rppt@linux$(echo .)ibm.com \
--cc=sakari.ailus@linux$(echo .)intel.com \
/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