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
| ||
|
Date: Tue, 4 Sep 2012 09:57:11 +0300 From: "Yuval Mintz" <yuvalmin@...adcom.com> To: "Stephen Rothwell" <sfr@...b.auug.org.au> cc: "Bjorn Helgaas" <bhelgaas@...gle.com>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, "Ariel Elior" <ariele@...adcom.com>, "Eilon Greenstein" <eilong@...adcom.com>, "Jiang Liu" <jiang.liu@...wei.com>, "David S. Miller" <davem@...emloft.net> Subject: Re: linux-next: manual merge of the pci tree with Linus' tree > Today's linux-next merge of the pci tree got a conflict in > drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit > 8eee694c3e66 ("bnx2x: fix unload previous driver flow when flr-capable") > from Linus' tree and commit 2a80eebcbf3e ("bnx2x: Use PCI Express > Capability accessors") from the pci tree. > > The former removes the function updated by the latter, so I just removed > the function (see below) and can carry the fix as necessary. Acked-by: Yuval Mintz <yuvalmin@...adcom.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists