linux-next: manual merge of the pci tree with the pci-current tree

linux-next: manual merge of the pci tree with the pci-current tree

[Stephen Rothwell]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/probe.c

between commit:

  788858ebc49a ("PCI: Look up IRQ domain by fwnode_handle")

from the pci-current tree and commit:

  5bd28338d681 ("PCI: Remove includes of empty asm-generic/pci-bridge.h")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/probe.c
index 1e34d211389a,5eb378fbe849..000000000000
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -15,8 -15,6 +15,7 @@@
  #include <linux/pci-aspm.h>
  #include <linux/aer.h>
  #include <linux/acpi.h>
 +#include <linux/irqdomain.h>
- #include <asm-generic/pci-bridge.h>
  #include "pci.h"
  
  #define CARDBUS_LATENCY_TIMER	176	/* secondary latency timer */

linux-next: manual merge of the pci tree with the pci-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2228 bytes --]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/pci.h

between commit:

  44bda4b7d26e ("PCI: Fix is_added/is_busmaster race condition")

from the pci-current tree and commit:

  1e4511604dfa ("PCI/AER: Expose internal API for obtaining AER information")

from the pci 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/pci/pci.h
index 08817253c8a2,ba078145bfaa..000000000000
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -301,16 -306,34 +307,44 @@@ static inline bool pci_dev_is_disconnec
  	return test_bit(PCI_DEV_DISCONNECTED, &dev->priv_flags);
  }
  
 +static inline void pci_dev_assign_added(struct pci_dev *dev, bool added)
 +{
 +	assign_bit(PCI_DEV_ADDED, &dev->priv_flags, added);
 +}
 +
 +static inline bool pci_dev_is_added(const struct pci_dev *dev)
 +{
 +	return test_bit(PCI_DEV_ADDED, &dev->priv_flags);
 +}
 +
+ #ifdef CONFIG_PCIEAER
+ #include <linux/aer.h>
+ 
+ #define AER_MAX_MULTI_ERR_DEVICES	5	/* Not likely to have more */
+ 
+ struct aer_err_info {
+ 	struct pci_dev *dev[AER_MAX_MULTI_ERR_DEVICES];
+ 	int error_dev_num;
+ 
+ 	unsigned int id:16;
+ 
+ 	unsigned int severity:2;	/* 0:NONFATAL | 1:FATAL | 2:COR */
+ 	unsigned int __pad1:5;
+ 	unsigned int multi_error_valid:1;
+ 
+ 	unsigned int first_error:5;
+ 	unsigned int __pad2:2;
+ 	unsigned int tlp_header_valid:1;
+ 
+ 	unsigned int status;		/* COR/UNCOR Error Status */
+ 	unsigned int mask;		/* COR/UNCOR Error Mask */
+ 	struct aer_header_log_regs tlp;	/* TLP Header */
+ };
+ 
+ int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info);
+ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
+ #endif	/* CONFIG_PCIEAER */
+ 
  #ifdef CONFIG_PCI_ATS
  void pci_restore_ats_state(struct pci_dev *dev);
  #else

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

linux-next: manual merge of the pci tree with the pci-current tree

[Mark Brown]

[-- 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 --]

Re: linux-next: manual merge of the pci tree with the pci-current tree

[Jesse Barnes]

On Fri, 26 Mar 2010 13:48:36 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> On Thu, 25 Mar 2010 19:10:49 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Time to rebase my -next branch onto my for-linus branch again I guess.
> 
> Any reason you wouldn't just merge your for-linus branch into your -next branch?

I don't like to end up with a bunch of merges, so I generally just
rebase my -next branch as necessary.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: manual merge of the pci tree with the pci-current tree

[Bjorn Helgaas]

On Thursday 25 March 2010 06:57:12 pm Stephen Rothwell wrote:
> Hi Jesse,
> 
> Today's linux-next merge of the pci tree got a conflict in
> arch/x86/pci/acpi.c between commit
> eb9fc8ef7cb1362374e55d9503e3e7458f319991 ("x86/PCI: for host bridge
> address space collisions, show conflicting resource") from the
> pci-current tree and commit 7589c4d809ccfc88100ba224e3358706fd21f37e
> ("x86/PCI: trim _CRS windows when they conflict with previous
> reservations") from the pci tree.

I'm sure Jesse has straightened this out already, but my intent
was to drop the "trim _CRS windows when they conflict" patch.

I replaced it with one called "truncate _CRS windows with _LEN >
_MAX - _MIN + 1".

Bjorn

Re: linux-next: manual merge of the pci tree with the pci-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

Hi Jesse,

On Thu, 25 Mar 2010 19:10:49 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Time to rebase my -next branch onto my for-linus branch again I guess.

Any reason you wouldn't just merge your for-linus branch into your -next branch?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the pci tree with the pci-current tree

[Jesse Barnes]

On Fri, 26 Mar 2010 11:57:12 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> Today's linux-next merge of the pci tree got a conflict in
> arch/x86/pci/acpi.c between commit
> eb9fc8ef7cb1362374e55d9503e3e7458f319991 ("x86/PCI: for host bridge
> address space collisions, show conflicting resource") from the
> pci-current tree and commit 7589c4d809ccfc88100ba224e3358706fd21f37e
> ("x86/PCI: trim _CRS windows when they conflict with previous
> reservations") from the pci tree.
> 
> I fixed it up (by using the pci tree version) and can carry the fix for a
> while.

Time to rebase my -next branch onto my for-linus branch again I guess.

-- 
Jesse Barnes, Intel Open Source Technology Center

linux-next: manual merge of the pci tree with the pci-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
arch/x86/pci/acpi.c between commit
eb9fc8ef7cb1362374e55d9503e3e7458f319991 ("x86/PCI: for host bridge
address space collisions, show conflicting resource") from the
pci-current tree and commit 7589c4d809ccfc88100ba224e3358706fd21f37e
("x86/PCI: trim _CRS windows when they conflict with previous
reservations") from the pci tree.

I fixed it up (by using the pci tree version) and can carry the fix for a
while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the pci tree with the pci-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

Hi Jesse,

On Fri, 6 Feb 2009 09:09:31 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Oops yeah, thanks for bringing this up.  I didn't rebase my linux-next branch 
> on top of my for-linus branch with the last set of changes...  Will do.

You shouldn't need to rebase just for this. Just wait for Linus to merge
the pci-current tree and then merge either it or Linus' tree into the
pci-tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the pci tree with the pci-current tree

[Rafael J. Wysocki]

On Friday 06 February 2009, Jesse Barnes wrote:
> On Thursday, February 5, 2009 6:50 pm Stephen Rothwell wrote:
> > Hi Jesse,
> >
> > Today's linux-next merge of the pci tree got a conflict in
> > drivers/pci/pcie/portdrv_pci.c between commit
> > 27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca ("PCI: PCIe portdrv: Simplify
> > suspend and resume") from the pci-current tree and commit
> > 120d3f44dd4c7a16ac71f26d4ff44ad7498cb81a ("PCI: PCIe portdrv: Implement
> > pm object") from the pci tree.
> >
> > I fixed it up (I used the pci tree version) and assume it will be fixed in
> > the pci tree soon.
> 
> Oops yeah, thanks for bringing this up.  I didn't rebase my linux-next branch 
> on top of my for-linus branch with the last set of changes...  Will do.

Please let me know if there are problems with rebasing any of my patches.

Best,
Rafael

Re: linux-next: manual merge of the pci tree with the pci-current tree

[Jesse Barnes]

On Thursday, February 5, 2009 6:50 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/pcie/portdrv_pci.c between commit
> 27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca ("PCI: PCIe portdrv: Simplify
> suspend and resume") from the pci-current tree and commit
> 120d3f44dd4c7a16ac71f26d4ff44ad7498cb81a ("PCI: PCIe portdrv: Implement
> pm object") from the pci tree.
>
> I fixed it up (I used the pci tree version) and assume it will be fixed in
> the pci tree soon.

Oops yeah, thanks for bringing this up.  I didn't rebase my linux-next branch 
on top of my for-linus branch with the last set of changes...  Will do.

-- 
Jesse Barnes, Intel Open Source Technology Center

linux-next: manual merge of the pci tree with the pci-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pcie/portdrv_pci.c between commit
27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca ("PCI: PCIe portdrv: Simplify
suspend and resume") from the pci-current tree and commit
120d3f44dd4c7a16ac71f26d4ff44ad7498cb81a ("PCI: PCIe portdrv: Implement
pm object") from the pci tree.

I fixed it up (I used the pci tree version) and assume it will be fixed in
the pci tree soon.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]