From: Roland Hieber <rhi@pengutronix.de>
To: "Ulrich Ölmann" <u.oelmann@pengutronix.de>
Cc: Pengutronix Public Open-Source-Development <oss-tools@pengutronix.de>
Subject: Re: [OSS-Tools] [PATCH dt-utils] state: fix typo
Date: Thu, 7 Feb 2019 12:37:40 +0100 [thread overview]
Message-ID: <20190207113740.6laduu54pxklxhvb@pengutronix.de> (raw)
In-Reply-To: <20190207092310.24714-1-u.oelmann@pengutronix.de>
On Thu, Feb 07, 2019 at 10:23:10AM +0100, Ulrich Ölmann wrote:
> This ports the following barebox commit:
>
> | commit 69b16bcc850c9eef0f399f531d0b0cfdacb9b4e4
> | Author: Ulrich Ölmann <u.oelmann@pengutronix.de>
> | Date: Wed Feb 6 11:34:02 2019 +0100
> |
> | common: state: fix typo
> |
> | Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> |
> | M common/state/backend_format_raw.c
> | M common/state/state.c
> | M common/state/state.h
>
> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> ---
> src/barebox-state/backend_format_raw.c | 4 ++--
> src/barebox-state/state.c | 2 +-
> src/barebox-state/state.h | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
Applied to next, thanks.
- Roland
>
> diff --git a/src/barebox-state/backend_format_raw.c b/src/barebox-state/backend_format_raw.c
> index 4369f76e376f..5a71149d3443 100644
> --- a/src/barebox-state/backend_format_raw.c
> +++ b/src/barebox-state/backend_format_raw.c
> @@ -127,7 +127,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
> return -EINVAL;
> }
>
> - if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTIFICATION)) {
> + if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTICATION)) {
> ret = backend_raw_digest_init(backend_raw);
> if (ret)
> return ret;
> @@ -153,7 +153,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
>
> *lenp = header->data_len + sizeof(*header);
>
> - if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTIFICATION)) {
> + if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTICATION)) {
> const void *hmac = data + header->data_len;
>
> /* hmac over header and data */
> diff --git a/src/barebox-state/state.c b/src/barebox-state/state.c
> index fd3cbbc54505..e95f91e29cd5 100644
> --- a/src/barebox-state/state.c
> +++ b/src/barebox-state/state.c
> @@ -127,7 +127,7 @@ int state_load(struct state *state)
>
> int state_load_no_auth(struct state *state)
> {
> - return state_do_load(state, STATE_FLAG_NO_AUTHENTIFICATION);
> + return state_do_load(state, STATE_FLAG_NO_AUTHENTICATION);
> }
>
> static int state_format_init(struct state *state, const char *backend_format,
> diff --git a/src/barebox-state/state.h b/src/barebox-state/state.h
> index 3a0662fd2594..912d6d484823 100644
> --- a/src/barebox-state/state.h
> +++ b/src/barebox-state/state.h
> @@ -6,7 +6,7 @@ struct state;
> struct mtd_info_user;
>
> enum state_flags {
> - STATE_FLAG_NO_AUTHENTIFICATION = (1 << 0),
> + STATE_FLAG_NO_AUTHENTICATION = (1 << 0),
> };
>
> enum state_variable_type {
> --
> 2.20.1
>
>
> _______________________________________________
> OSS-Tools mailing list
> OSS-Tools@pengutronix.de
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
prev parent reply other threads:[~2019-02-07 11:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 9:23 Ulrich Ölmann
2019-02-07 11:37 ` Roland Hieber [this message]
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=20190207113740.6laduu54pxklxhvb@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=oss-tools@pengutronix.de \
--cc=u.oelmann@pengutronix.de \
/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