From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Bjorn Helgaas <bhelgaas@google•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kishon Vijay Abraham I <kishon@ti•com>,
Cyril Bur <cyrilbur@gmail•com>,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>
Subject: linux-next: manual merge of the char-misc tree with the pci tree
Date: Fri, 21 Apr 2017 14:45:40 +1000 [thread overview]
Message-ID: <20170421144540.2635313f@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/misc/Makefile
between commit:
58c89c8aa0e8 ("misc: Add host side PCI driver for PCI test function device")
from the pci tree and commits:
6c4e97678501 ("drivers/misc: Add Aspeed LPC control driver")
51c1e9b554c9 ("auxdisplay: Move panel.c to drivers/auxdisplay folder")
from the char-misc 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/misc/Makefile
index 6e139cd70421,4fb10af2ea1c..000000000000
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -53,8 -52,7 +52,8 @@@ obj-$(CONFIG_GENWQE) += genwqe
obj-$(CONFIG_ECHO) += echo/
obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o
obj-$(CONFIG_CXL_BASE) += cxl/
- obj-$(CONFIG_PANEL) += panel.o
+ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o
+obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o
lkdtm-$(CONFIG_LKDTM) += lkdtm_core.o
lkdtm-$(CONFIG_LKDTM) += lkdtm_bugs.o
next reply other threads:[~2017-04-21 4:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 4:45 Stephen Rothwell [this message]
2017-04-21 4:55 ` linux-next: manual merge of the char-misc tree with the pci tree Greg KH
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=20170421144540.2635313f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=arnd@arndb$(echo .)de \
--cc=bhelgaas@google$(echo .)com \
--cc=cyrilbur@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=kishon@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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