linux-kernel - linux-next: manual merge of the net-next tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 26 Apr 2013 13:31:08 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexander Duyck <alexander.h.duyck@...el.com>,
	Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Subject: linux-next: manual merge of the net-next tree with the pci tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
include/linux/pci.h between commit f39d5b72913e ("PCI: Remove "extern"
from function declarations") from the pci tree and commit 5a8eb24292ff
("pci: Add SRIOV helper function to determine if VFs are assigned to
guest") from the net-next tree.

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

(I would have preferred that all these declarations were changed to have
"extern" added to ones that were missing it, but ...)

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/pci.h
index e73dfa3,43e45ac..0000000
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -1657,12 -1640,13 +1657,13 @@@ int pci_ext_cfg_avail(void)
  void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
  
  #ifdef CONFIG_PCI_IOV
 -extern int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
 -extern void pci_disable_sriov(struct pci_dev *dev);
 -extern irqreturn_t pci_sriov_migration(struct pci_dev *dev);
 -extern int pci_num_vf(struct pci_dev *dev);
 +int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
 +void pci_disable_sriov(struct pci_dev *dev);
 +irqreturn_t pci_sriov_migration(struct pci_dev *dev);
 +int pci_num_vf(struct pci_dev *dev);
+ int pci_vfs_assigned(struct pci_dev *dev);
 -extern int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
 -extern int pci_sriov_get_totalvfs(struct pci_dev *dev);
 +int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
 +int pci_sriov_get_totalvfs(struct pci_dev *dev);
  #else
  static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
  {

Content of type "application/pgp-signature" skipped