[<prev] [next>] [day] [month] [year] [list]
Date: Mon, 17 Jun 2013 11:42:43 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Bjorn Helgaas <bhelgaas@...gle.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Lance Ortiz <lance.ortiz@...com>,
Tony Luck <tony.luck@...el.com>, Betty Dall <betty.dall@...com>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in
include/linux/aer.h between commit 37448adfc7ce ("aerdrv: Move
cper_print_aer() call out of interrupt context") from Linus' tree and
commit fde41b9fa2d0 ("PCI/AER: Remove "extern" from function
declarations") from the pci tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc include/linux/aer.h
index 737f90a,55bb3dc..0000000
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@@ -49,11 -53,10 +53,10 @@@ static inline int pci_cleanup_aer_uncor
}
#endif
- extern void cper_print_aer(struct pci_dev *dev,
- int cper_severity, struct aer_capability_regs *aer);
- extern int cper_severity_to_aer(int cper_severity);
- extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
- int severity,
- struct aer_capability_regs *aer_regs);
-void cper_print_aer(const char *prefix, struct pci_dev *dev, int cper_severity,
++void cper_print_aer(struct pci_dev *dev, int cper_severity,
+ struct aer_capability_regs *aer);
+ int cper_severity_to_aer(int cper_severity);
+ void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
- int severity);
++ int severity, struct aer_capability_regs *aer_regs);
#endif //_AER_H_
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists