On Tue, Dec 24, 2013 at 09:45:03AM -0600, Evan Hosseini wrote: > --- > Staging: android: fix parenthesis coding style issue in alarm-dev.c What happened to your Subject:? Also, why put the '---' line here? That means that git will delete everything else. > This is a patch to the alarm-dev.c file that fixes up a > parenthesis warning found by the checkpatch.pl tool. > Signed-off-by: Evan Hosseini <hosse005@xxxxxxx> Please put a blank line between the changelog info and the signed-off-by: line. > > --- > drivers/staging/android/alarm-dev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c > index 647694f..893362f 100644 > --- a/drivers/staging/android/alarm-dev.c > +++ b/drivers/staging/android/alarm-dev.c > @@ -68,7 +68,6 @@ static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT]; > */ > static int is_wakeup(enum android_alarm_type type) > { > - return (type == ANDROID_ALARM_RTC_WAKEUP || > - type == ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP); > + return type == ANDROID_ALARM_RTC_WAKEUP || > + type == ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP; This patch doesn't apply to the linux-next tree, as someone else has already made this change, sorry. greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel