The patch titled Subject: rapidio: fix kerneldoc warnings after DMA support was added has been added to the -mm tree. Its filename is rapidio-fix-kerneldoc-warnings-after-dma-support-was-added.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Alexandre Bounine <alexandre.bounine@xxxxxxx> Subject: rapidio: fix kerneldoc warnings after DMA support was added Signed-off-by: Alexandre Bounine <alexandre.bounine@xxxxxxx> Reported-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Cc: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/rio.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN include/linux/rio.h~rapidio-fix-kerneldoc-warnings-after-dma-support-was-added include/linux/rio.h --- a/include/linux/rio.h~rapidio-fix-kerneldoc-warnings-after-dma-support-was-added +++ a/include/linux/rio.h @@ -236,6 +236,7 @@ enum rio_phy_type { * @phys_efptr: RIO port extended features pointer * @name: Port name string * @priv: Master port private data + * @dma: DMA device associated with mport */ struct rio_mport { struct list_head dbells; /* list of doorbell events */ @@ -404,7 +405,7 @@ union rio_pw_msg { #ifdef CONFIG_RAPIDIO_DMA_ENGINE -/** +/* * enum rio_write_type - RIO write transaction types used in DMA transfers * * Note: RapidIO specification defines write (NWRITE) and _ Patches currently in -mm which might be from alexandre.bounine@xxxxxxx are linux-next.patch rapidio-tsi721-modify-mport-name-assignment.patch rapidio-fix-kerneldoc-warnings-after-dma-support-was-added.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