From: Greg KH <gregkh@linuxfoundation.org>
To: Petr Vorel <pvorel@suse.cz>
Cc: stable@vger.kernel.org
Subject: Re: [PATCH] Fix backport of f18ddc13af981ce3c7b7f26925f099e7c6929aba
Date: Fri, 8 Nov 2019 17:08:12 +0100 [thread overview]
Message-ID: <20191108160812.GA991932@kroah.com> (raw)
In-Reply-To: <20191108155316.13109-1-pvorel@suse.cz>
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
next prev parent reply other threads:[~2019-11-08 16:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 15:53 [PATCH] Fix backport of f18ddc13af981ce3c7b7f26925f099e7c6929aba Petr Vorel
2019-11-08 16:08 ` Greg KH [this message]
2019-11-09 20:52 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191108160812.GA991932@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=pvorel@suse.cz \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).