From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree
Date: Fri, 24 Jan 2020 16:15:58 +1100 [thread overview]
Message-ID: <20200124161558.7cbb88c9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/platform/x86/intel_scu_ipc.c
between commit:
74e9748b9b21 ("platform/x86: intel_scu_ipc: Drop intel_scu_ipc_i2c_cntrl()")
from the drivers-x86 tree and commit:
4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
from the generic-ioremap tree.
I fixed it up (the former removed the code updated by the latter, so I
just did that) 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:[~2020-01-24 5:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 5:15 Stephen Rothwell [this message]
2020-01-27 23:03 ` linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree Stephen Rothwell
2020-01-28 9:11 ` Andy Shevchenko
2020-01-28 10:06 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-01-10 5:52 Stephen Rothwell
2020-01-10 10:22 ` Andy Shevchenko
2020-01-27 22:56 ` 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=20200124161558.7cbb88c9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andy.shevchenko@gmail.com \
--cc=dvhart@infradead.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.