From: Eli Cohen Date: Sun, 3 Apr 2011 07:07:44 +0000 (+0300) Subject: Flatten the entire tree fixes X-Git-Tag: v4.1.12-92~264^2~5^2~16 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fe96a34fdb7ec6d4520ba2231f31720d58ca096d;p=users%2Fjedix%2Flinux-maple.git Flatten the entire tree fixes As from now we are going to avoid using patches to commit changes to the driver. Instead, we will push directly to the source files. Backports are still maintained but only for 2.6.18-EL5.5; backaports of 2.6.32 are completely removed. Signed-off-by: Eli Cohen --- diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c index 1b0ff42d2dd6..dca141f9ba23 100644 --- a/drivers/infiniband/ulp/sdp/sdp_main.c +++ b/drivers/infiniband/ulp/sdp/sdp_main.c @@ -1360,7 +1360,7 @@ static inline void sdp_push_pending_frames(struct sock *sk) /* SOL_SOCKET level options are handled by sock_setsockopt */ static int sdp_setsockopt(struct sock *sk, int level, int optname, - char __user *optval, int optlen) + char __user *optval, unsigned optlen) { struct sdp_sock *ssk = sdp_sk(sk); int val;