public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH] conflict with/replace firmware-netronome
Date: Tue, 16 Feb 2021 14:10:37 +0100	[thread overview]
Message-ID: <20210216131037.27680-1-d.csapak@proxmox.com> (raw)

we include them already

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 8eefda2..e63eed1 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Conflicts: firmware-amd-graphics,
            firmware-linux-nonfree,
            firmware-misc-nonfree,
            firmware-myricom,
+           firmware-netronome,
            firmware-netxen,
            firmware-qlogic,
            firmware-ralink,
@@ -45,6 +46,7 @@ Replaces: firmware-amd-graphics,
           firmware-misc-nonfree,
           firmware-myricom,
           firmware-netxen,
+          firmware-netronome,
           firmware-qlogic,
           firmware-ralink,
           firmware-realtek,
-- 
2.20.1





             reply	other threads:[~2021-02-16 13:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-16 13:10 Dominik Csapak [this message]
2021-02-16 13:56 ` [pve-devel] applied: " Thomas Lamprecht

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=20210216131037.27680-1-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal