From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jesper Nilsson <jesper@jni.nu>,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the pci tree with the asm-generic tree
Date: Tue, 3 Apr 2018 12:14:15 +1000 [thread overview]
Message-ID: <20180403121415.20c4843e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
arch/cris/arch-v32/drivers/pci/bios.c
between commits:
c690eddc2f3b ("CRIS: Drop support for the CRIS port")
fd8773f9f544 ("arch: remove frv port")
739d875dd698 ("mn10300: Remove the architecture")
from the asm-generic tree and commit:
31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")
from the pci tree.
I fixed it up (I just removed the files) 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:[~2018-04-03 2:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 2:14 Stephen Rothwell [this message]
2018-04-04 18:38 ` Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2014-09-26 3:29 Stephen Rothwell
2014-09-26 7:00 ` Thierry Reding
2014-09-26 9:13 ` Liviu Dudau
2014-09-26 9:26 ` 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=20180403121415.20c4843e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=dhowells@redhat.com \
--cc=jesper@jni.nu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®