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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 9 Jan 2020 16:12:02 +1100
From:   Stephen Rothwell <>
To:     Christoph Hellwig <>, David Miller <>,
        Networking <>
Cc:     Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Alexandru-Mihai Maftei <>
Subject: linux-next: manual merge of the generic-ioremap tree with the
 net-next tree

Hi all,

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


between commit:

  f1826756b499 ("sfc: move struct init and fini code")

from the net-next tree and commit:

  4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")

from the generic-ioremap tree.

I fixed it up (the latter moved the code, so I applied the following
merge fix patch) 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

From: Stephen Rothwell <>
Date: Thu, 9 Jan 2020 16:08:52 +1100
Subject: [PATCH] fix up for "sfc: move struct init and fini code"

Signed-off-by: Stephen Rothwell <>
 drivers/net/ethernet/sfc/efx_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c
index fe74c66c8ec6..bf0126633c25 100644
--- a/drivers/net/ethernet/sfc/efx_common.c
+++ b/drivers/net/ethernet/sfc/efx_common.c
@@ -954,7 +954,7 @@ int efx_init_io(struct efx_nic *efx, int bar, dma_addr_t dma_mask,
 		goto fail3;
-	efx->membase = ioremap_nocache(efx->membase_phys, mem_map_size);
+	efx->membase = ioremap(efx->membase_phys, mem_map_size);
 	if (!efx->membase) {
 		netif_err(efx, probe, efx->net_dev,
 			  "could not map memory BAR at %llx+%x\n",

Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists