On Fri, Nov 08, 2019 at 04:53:16PM +0100, Petr Vorel wrote:

for v4.4 and v4.9 stable branches

Signed-off-by: Petr Vorel pvorel@suse.cz

Hi,

Patch for stable-queue.git of previously sent 2 patches, if needed.

Kind regards, Petr

...armtimer-use-eopnotsupp-instead-of-enotsupp.patch | 20 +++++++++++++++++++- ...armtimer-use-eopnotsupp-instead-of-enotsupp.patch | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/releases/4.4.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch b/releases/4.4.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch index 6e1622d11..64864792b 100644 --- a/releases/4.4.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch +++ b/releases/4.4.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch @@ -38,7 +38,25 @@ Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org if (!capable(CAP_WAKE_ALARM)) return -EPERM; -@@ -759,7 +759,7 @@ static int alarm_timer_nsleep(const cloc +@@ -573,7 +573,7 @@ static void alarm_timer_get(struct k_itimer *timr,

• static int alarm_timer_del(struct k_itimer *timr)
• {
• if (!rtcdev)

+- return -ENOTSUPP; ++ return -EOPNOTSUPP;

• if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)

• return TIMER_RETRY;
  

+@@ -597,7 +597,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,

• ktime_t exp;
• if (!rtcdev)

+- return -ENOTSUPP; ++ return -EOPNOTSUPP;

• if (flags & ~TIMER_ABSTIME)

• return -EINVAL;
  

+@@ -759,7 +759,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, struct restart_block *restart; if (!alarmtimer_get_rtcdev()) diff --git a/releases/4.9.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch b/releases/4.9.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch index 1c783e622..f6af42535 100644 --- a/releases/4.9.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch +++ b/releases/4.9.195/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch @@ -38,7 +38,25 @@ Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org if (!capable(CAP_WAKE_ALARM)) return -EPERM; -@@ -772,7 +772,7 @@ static int alarm_timer_nsleep(const cloc +@@ -586,7 +586,7 @@ static void alarm_timer_get(struct k_itimer *timr,

• static int alarm_timer_del(struct k_itimer *timr)
• {
• if (!rtcdev)

+- return -ENOTSUPP; ++ return -EOPNOTSUPP;

• if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)

• return TIMER_RETRY;
  

+@@ -610,7 +610,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,

• ktime_t exp;
• if (!rtcdev)

+- return -ENOTSUPP; ++ return -EOPNOTSUPP;

• if (flags & ~TIMER_ABSTIME)

• return -EINVAL;
  

+@@ -772,7 +772,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, struct restart_block *restart; if (!alarmtimer_get_rtcdev())

It's a bit hard to go back in time and modify a patch that is already in the main linux-stable.git tree like this :)

If we messed up the backport, great, please send a patch I can apply to the 4.9.y kernel tree with the information in it that I can accept to resolve this issue.

thanks,

greg k-h