linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lance Ortiz <lance.ortiz@hp.com>, Tony Luck <tony.luck@intel.com>,
	Betty Dall <betty.dall@hp.com>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Date: Mon, 17 Jun 2013 11:42:43 +1000	[thread overview]
Message-ID: <20130617114243.1f3f14901db4a4e38060daf8@canb.auug.org.au> (raw)

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

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@canb.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_
  

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

             reply	other threads:[~2013-06-17  1:42 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-17  1:42 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-01-13 23:45 linux-next: manual merge of the pci tree with Linus' tree Stephen Rothwell
2022-01-14  5:48 ` Sergio Paracuellos
2022-01-14  6:53   ` Stephen Rothwell
2022-01-14  6:57     ` Sergio Paracuellos
2021-08-25  0:57 Stephen Rothwell
2021-02-23  0:19 Stephen Rothwell
2020-05-14  1:02 Stephen Rothwell
2020-03-30 23:49 Stephen Rothwell
2020-03-31  8:37 ` Geert Uytterhoeven
2020-03-24 23:58 Stephen Rothwell
2019-09-19 12:33 Mark Brown
2018-07-20  1:03 Stephen Rothwell
2018-07-20  9:15 ` Lorenzo Pieralisi
2018-07-20 10:49   ` Thomas Petazzoni
2018-04-03  2:29 Stephen Rothwell
2018-03-26  1:23 Stephen Rothwell
2018-03-27 16:19 ` Rob Herring
2017-06-26  0:51 Stephen Rothwell
2017-07-03  2:58 ` Stephen Rothwell
2016-12-08 23:44 Stephen Rothwell
2016-06-23  1:44 Stephen Rothwell
2016-06-23 16:43 ` Bjorn Helgaas
2016-01-20 23:33 Stephen Rothwell
2013-06-04  1:49 Stephen Rothwell
2013-06-04  2:11 ` Bjorn Helgaas
2012-09-04  2:04 Stephen Rothwell
2012-09-04  1:59 Stephen Rothwell
2012-09-04  6:57 ` Yuval Mintz
2012-06-25  2:31 Stephen Rothwell
2012-06-25  6:32 ` huang ying
2012-06-25 14:14 ` Alan Stern
2012-06-19  1:15 Stephen Rothwell
2010-12-20  2:08 Stephen Rothwell
2009-12-07  0:25 Stephen Rothwell
2009-12-07  0:25 Stephen Rothwell
2009-10-14  0:05 Stephen Rothwell
2009-10-14  0:38 ` Jesse Barnes
2009-10-14  2:10   ` Stephen Rothwell
2009-10-14  7:41 ` David Woodhouse
2009-06-30  1:56 Stephen Rothwell
2009-06-30  2:01 ` Jesse Barnes
2009-06-30  2:16   ` Matthew Wilcox
2009-06-30 16:00     ` Jesse Barnes

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=20130617114243.1f3f14901db4a4e38060daf8@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=betty.dall@hp.com \
    --cc=bhelgaas@google.com \
    --cc=lance.ortiz@hp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=tony.luck@intel.com \
    /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;
as well as URLs for NNTP newsgroup(s).