Hi Jeff,
Today's linux-next merge of the libata tree got a conflict in
drivers/ata/libahci.c between commit 49743170556e ("ahci: change 'masking
port_map' printk to KERN_WARNING level") from the Linus' tree and commit
c4d21d680e91 ("ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(")
from the libata tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/ata/libahci.c
index 41223c7,d8ff9c4..0000000
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@@ -452,9 -455,9 +455,9 @@@ void ahci_save_initial_config(struct de
}
if (mask_port_map) {
- dev_printk(KERN_WARNING, dev, "masking port_map 0x%x -> 0x%x\n",
- port_map,
- port_map & mask_port_map);
- dev_err(dev, "masking port_map 0x%x -> 0x%x\n",
++ dev_warn(dev, "masking port_map 0x%x -> 0x%x\n",
+ port_map,
+ port_map & mask_port_map);
port_map &= mask_port_map;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
