Skip to contentSkip to conversation

Requesting inclusion of 12dd7ecf2323 in linux-3.14.y

DISCUSSION Mason 2 participants 2 messages Jul 31, 2015 Stable branch

lore
Share & tools
lore

Mason

author
#0 lore raw

Hello Greg and al,

Do you accept trivial patches for stable?

If so, could you apply 12dd7ecf2323 to linux-3.14.y?

Apprently, we've had this patch locally since 2012, but no one cared to push it upstream :-(

commit 12dd7ecf2323c572b1d302707eada4900848dced

Author: Kees Cook <[email protected]>
Date:   Thu May 1 14:15:02 2014 -0700

lockd: avoid warning when CONFIG_SYSCTL undefined

When building without CONFIG_SYSCTL, the compiler saw an unused label. This moves the label into the #ifdef it is used under.

fs/lockd/svc.c: In function ‘init_nlm’:
fs/lockd/svc.c:626:1: warning: label ‘err_sysctl’ defined but not used [-Wunused-label]

Regards.

#1 lore raw
Quoted 3 lines · Mason

Hello Greg and al,

Do you accept trivial patches for stable?

Not really, take a look at Documentation/stable_kernel_rules.txt for the full list.

Quoted 9 lines

If so, could you apply 12dd7ecf2323 to linux-3.14.y?

Apprently, we've had this patch locally since 2012, but no one cared to push it upstream :-(

commit 12dd7ecf2323c572b1d302707eada4900848dced

Author: Kees Cook <[email protected]>
Date:   Thu May 1 14:15:02 2014 -0700
Quoted 7 lines

lockd: avoid warning when CONFIG_SYSCTL undefined

When building without CONFIG_SYSCTL, the compiler saw an unused label. This moves the label into the #ifdef it is used under.

fs/lockd/svc.c: In function ‘init_nlm’:
fs/lockd/svc.c:626:1: warning: label ‘err_sysctl’ defined but not used [-Wunused-label]

Everyone who really uses the kernel enables CONFIG_SYSCTL, so I don't see this being something that is worth adding to the tree.

thanks,

greg k-h