Patch "net: caif: fix misleading indentation" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

net: caif: fix misleading indentation

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-caif-fix-misleading-indentation.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Arnd Bergmann <[email protected]>
Date: Mon, 14 Mar 2016 15:18:38 +0100
Subject: net: caif: fix misleading indentation

From: Arnd Bergmann <[email protected]>

commit 8e0cc8c326d99e41468c96fea9785ab78883a281 upstream.

gcc points out code that is not indented the way it is interpreted:

net/caif/cfpkt_skbuff.c: In function 'cfpkt_setlen':
net/caif/cfpkt_skbuff.c:289:4: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]

    return cfpkt_getlen(pkt);
    ^~~~~~

net/caif/cfpkt_skbuff.c:286:3: note: ...this 'else' clause, but it is not
else
^~~~

It is clear from the context that not returning here would be a bug, as we'd end up passing a negative length into a function that takes a u16 length, so it is not missing curly braces here, and I'm assuming that the indentation is the only part that's wrong about it.

---
 net/caif/cfpkt_skbuff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -286,7 +286,7 @@ int cfpkt_setlen(struct cfpkt *pkt, u16
 		else
 			skb_trim(skb, len);
 
-			return cfpkt_getlen(pkt);
+		return cfpkt_getlen(pkt);
 	}
 
 	/* Need to expand SKB */

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/include-linux-kernel.h-change-abs-macro-so-it-uses-consistent-return-type.patch queue-4.4/ath9k-fix-misleading-indentation.patch queue-4.4/iwlegacy-avoid-warning-about-missing-braces.patch queue-4.4/kbuild-disable-maybe-uninitialized-warning-for-config_profile_all_branches.patch queue-4.4/net-caif-fix-misleading-indentation.patch queue-4.4/nouveau-fix-nv40_perfctr_next-cleanup-regression.patch queue-4.4/gcov-disable-wmaybe-uninitialized-warning.patch queue-4.4/am437x-vfpe-fix-typo-in-vpfe_get_app_input_index.patch queue-4.4/fix-build-warning-in-kernel-cpuset.c.patch queue-4.4/reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch