From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Felix Mellmann <flix.ptxdist@benfm.de>
Subject: Re: [ptxdist] [APPLIED] ifplugd: Updated current patch set using git ptx-patches
Date: Wed, 16 Jun 2021 12:35:01 +0200 [thread overview]
Message-ID: <20210616103501.1994927-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210531132947.220277-1-flix.ptxdist@benfm.de>
Thanks, applied as b82b12975306f5f7da93dfee8290ff40791947e2.
Michael
[sent from post-receive hook]
On Wed, 16 Jun 2021 12:35:01 +0200, Felix Mellmann <flix.ptxdist@benfm.de> wrote:
> Updated the current set of patches of the ifplugd package.
> This is required to allow adding further patches to
> the package by using git ptx-patches.
>
> Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
> Message-Id: <20210531132947.220277-1-flix.ptxdist@benfm.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/ifplugd-0.28/ifplugd-fix-include.diff b/patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> similarity index 70%
> rename from patches/ifplugd-0.28/ifplugd-fix-include.diff
> rename to patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> index 4e305ee77c35..be69d8050f0c 100644
> --- a/patches/ifplugd-0.28/ifplugd-fix-include.diff
> +++ b/patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> @@ -1,5 +1,6 @@
> From: Ladislav Michl <ladis@linux-mips.org>
> -Subject: Compilation fails because of kernel header inclusion
> +Date: Mon, 31 May 2021 15:00:21 +0200
> +Subject: [PATCH] Compilation fails because of kernel header inclusion
>
> Fixes the following error:
>
> @@ -9,8 +10,13 @@ In file included from interface.c:27:
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> ---- ifplugd-0.28/src/interface.c 2005-01-05 01:25:31.000000000 +0100
> -+++ ifplugd-0.28/src/interface.c 2007-07-15 21:04:54.000000000 +0200
> + src/interface.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/interface.c b/src/interface.c
> +index e5038f41ba52..352b4799ef4b 100644
> +--- a/src/interface.c
> ++++ b/src/interface.c
> @@ -23,11 +23,9 @@
> #endif
>
> diff --git a/patches/ifplugd-0.28/series b/patches/ifplugd-0.28/series
> index f093c5e628fd..a564ff7ddc85 100644
> --- a/patches/ifplugd-0.28/series
> +++ b/patches/ifplugd-0.28/series
> @@ -1 +1,4 @@
> -ifplugd-fix-include.diff
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> +# bbf895f48ef5cf6b103f60be48b437c9 - git-ptx-patches magic
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-06-16 10:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 13:29 [ptxdist] [PATCH 1/2] " Felix Mellmann
2021-05-31 13:29 ` [ptxdist] [PATCH 2/2] ifplugd: Added new patch to fix a linker error with GCC10 Felix Mellmann
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-16 10:35 ` Michael Olbrich [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=20210616103501.1994927-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=flix.ptxdist@benfm.de \
--cc=ptxdist@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