The patch titled rapidio-add-new-sysfs-attributes-v2 has been removed from the -mm tree. Its filename was rapidio-add-new-sysfs-attributes-v2.patch This patch was dropped because it was folded into rapidio-add-new-sysfs-attributes.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: rapidio-add-new-sysfs-attributes-v2 From: Alexandre Bounine <alexandre.bounine@xxxxxxx> Signed-off-by: Alexandre Bounine <alexandre.bounine@xxxxxxx> Cc: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> Cc: Matt Porter <mporter@xxxxxxxxxxxxxxxxxxx> Cc: Li Yang <leoli@xxxxxxxxxxxxx> Cc: Thomas Moll <thomas.moll@xxxxxxxxx> Cc: Micha Nelissen <micha@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rapidio/rio-sysfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff -puN drivers/rapidio/rio-sysfs.c~rapidio-add-new-sysfs-attributes-v2 drivers/rapidio/rio-sysfs.c --- a/drivers/rapidio/rio-sysfs.c~rapidio-add-new-sysfs-attributes-v2 +++ a/drivers/rapidio/rio-sysfs.c @@ -59,8 +59,8 @@ static ssize_t lprev_show(struct device { struct rio_dev *rdev = to_rio_dev(dev); - return sprintf(buf, "%02d %s\n", RIO_GET_PORT_NUM(rdev->swpinfo), - (rdev->prev) ? rio_name(rdev->prev) : "host"); + return sprintf(buf, "%s\n", + (rdev->prev) ? rio_name(rdev->prev) : "root"); } static ssize_t lnext_show(struct device *dev, @@ -73,8 +73,10 @@ static ssize_t lnext_show(struct device if (rdev->pef & RIO_PEF_SWITCH) { for (i = 0; i < RIO_GET_TOTAL_PORTS(rdev->swpinfo); i++) { if (rdev->rswitch->nextdev[i]) - str += sprintf(str, "%02d %s\n", i, + str += sprintf(str, "%s\n", rio_name(rdev->rswitch->nextdev[i])); + else + str += sprintf(str, "null\n"); } } _ Patches currently in -mm which might be from alexandre.bounine@xxxxxxx are rapidio-add-new-sysfs-attributes.patch rapidio-add-rapidio-documentation.patch rapidio-add-rapidio-documentation-v2.patch rapidio-add-architecture-specific-callbacks.patch rapidio-modify-configuration-to-support-pci-srio-controller.patch rapidio-modify-configuration-to-support-pci-srio-controller-fix-configuration-option.patch rapidio-modify-subsystem-and-driver-initialization-sequence.patch rapidio-modify-mport-id-assignment.patch rapidio-remove-mport-resource-reservation-from-common-rio-code.patch rapidio-fix-potential-null-deref-on-failure-path.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html