The patch titled Subject: ipmi: remove superfluous kernel/userspace explanation has been added to the -mm tree. Its filename is ipmi-remove-superfluous-kernel-userspace-explanation.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: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Subject: ipmi: remove superfluous kernel/userspace explanation Given the obvious distinction between kernel and userspace supported by uapi/, it seems unnecessary to comment on that. Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/ipmi.h | 4 ---- include/uapi/linux/ipmi.h | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) diff -puN include/linux/ipmi.h~ipmi-remove-superfluous-kernel-userspace-explanation include/linux/ipmi.h --- a/include/linux/ipmi.h~ipmi-remove-superfluous-kernel-userspace-explanation +++ a/include/linux/ipmi.h @@ -35,10 +35,6 @@ #include <uapi/linux/ipmi.h> - -/* - * The in-kernel interface. - */ #include <linux/list.h> #include <linux/proc_fs.h> diff -puN include/uapi/linux/ipmi.h~ipmi-remove-superfluous-kernel-userspace-explanation include/uapi/linux/ipmi.h --- a/include/uapi/linux/ipmi.h~ipmi-remove-superfluous-kernel-userspace-explanation +++ a/include/uapi/linux/ipmi.h @@ -59,15 +59,7 @@ * if it becomes full and it is queried once a second to see if * anything is in it. Incoming commands to the driver will get * delivered as commands. - * - * This driver provides two main interfaces: one for in-kernel - * applications and another for userland applications. The - * capabilities are basically the same for both interface, although - * the interfaces are somewhat different. The stuff in the - * #ifdef __KERNEL__ below is the in-kernel interface. The userland - * interface is defined later in the file. */ - - + */ /* * This is an overlay for all the address types, so it's easy to _ Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are linux-next.patch ipmi-remove-superfluous-kernel-userspace-explanation.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