The patch titled
     ipc: convert handmade 'min' to min().
has been added to the -mm tree.  Its filename is
     ipc-convert-handmade-min-to-min.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: ipc: convert handmade 'min' to min().
From: Richard Knutsson <[EMAIL PROTECTED]>

Convert handmade 'min' to min().

Signed-off-by: Richard Knutsson <[EMAIL PROTECTED]>
Cc: Nadia Derbey <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 ipc/msg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN ipc/msg.c~ipc-convert-handmade-min-to-min ipc/msg.c
--- a/ipc/msg.c~ipc-convert-handmade-min-to-min
+++ a/ipc/msg.c
@@ -898,7 +898,7 @@ out_unlock:
        if (IS_ERR(msg))
                return PTR_ERR(msg);
 
-       msgsz = (msgsz > msg->m_ts) ? msg->m_ts : msgsz;
+       msgsz = min(msgsz, msg->m_ts);
        *pmtype = msg->m_type;
        if (store_msg(mtext, msg, msgsz))
                msgsz = -EFAULT;
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

kernel-compliment-va_copy-with-va_end.patch
git-dvb.patch
pcmcia-3c574_cs-fix-dubious-bitfield-warning.patch
pcmcia-3c574_cs-fix-shadow-variable-warning.patch
pcmcia-axnet_cs-make-functions-static.patch
pcmcia-axnet_cs-make-use-of-max-instead-of-handcrafted-one.patch
pcmcia-fmvj18x_cs-fix-shadow-variable-warning.patch
pcmcia-pcnet_cs-fix-shadow-variable-warning.patch
mm-mmap-remove-sparse-warning-null-as-0.patch
dio-array_size-cleanup-update.patch
dio-array_size-cleanup-update-checkpatch-fixes.patch
reiserfs-complement-va_start-with-va_end.patch
kernel-paramsc-remove-sparse-warning-different-signedness.patch
ipc-convert-handmade-min-to-min.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to