From: Mark Brown <broonie@kernel•org>
To: Bjorn Helgaas <bhelgaas@google•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the pci tree with the pci-current tree
Date: Wed, 12 Mar 2014 13:00:09 +0000 [thread overview]
Message-ID: <20140312130009.2c05e3aea858358daacfbba0@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in drivers/pci/pci.c between commit 5f4fe7ad54087 ("PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled") from the pci-current tree and commit 1e2571a7813836 ("PCI: Enable INTx if BIOS left them disabled") from the pci tree.
I fixed it up resulting in the contents of pci-current and can carry the fix as necessary (no action is required).
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-12 13:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 13:00 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 0:55 linux-next: manual merge of the pci tree with the pci-current tree Stephen Rothwell
2024-10-24 0:25 Stephen Rothwell
2024-10-24 6:56 ` Bartosz Golaszewski
2024-10-24 18:50 ` Bjorn Helgaas
2024-06-03 0:24 Stephen Rothwell
2018-08-01 0:42 Stephen Rothwell
2016-02-24 0:02 Stephen Rothwell
2010-03-26 0:57 Stephen Rothwell
2010-03-26 2:10 ` Jesse Barnes
2010-03-26 2:48 ` Stephen Rothwell
2010-03-26 16:03 ` Jesse Barnes
2010-03-26 14:43 ` Bjorn Helgaas
2009-02-06 2:50 Stephen Rothwell
2009-02-06 17:09 ` Jesse Barnes
2009-02-06 23:49 ` Rafael J. Wysocki
2009-02-07 0:07 ` 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=20140312130009.2c05e3aea858358daacfbba0@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=bhelgaas@google$(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