drop queue-4.19/ib-mlx5-fix-devx-support-for-mlx5_cmd_op_init2init_q.patch

it broke the build

diff --git a/queue-4.19/alsa-hda-realtek-enable-mute-led-on-an-hp-system.patch b/queue-4.19/alsa-hda-realtek-enable-mute-led-on-an-hp-system.patch
index 210861e1bb6568583c0e13a3a0c9b4104e951416..c096cb517fd0887a3cb6b53716911a7830eec4fa 100644 (file)
--- a/queue-4.19/alsa-hda-realtek-enable-mute-led-on-an-hp-system.patch
+++ b/queue-4.19/alsa-hda-realtek-enable-mute-led-on-an-hp-system.patch
@@ -19,14 +19,12 @@ Link: https://lore.kernel.org/r/20200327044626.29582-1-kai.heng.feng@canonical.c
 Signed-off-by: Takashi Iwai <tiwai@suse.de>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- sound/pci/hda/patch_realtek.c | 12 ++++++++++++
+ sound/pci/hda/patch_realtek.c |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 70f722392cf50..45177c4eadad3 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
-@@ -3918,6 +3918,12 @@ static void alc269_fixup_hp_gpio_led(struct hda_codec *codec,
+@@ -3918,6 +3918,12 @@ static void alc269_fixup_hp_gpio_led(str
        alc_fixup_hp_gpio_led(codec, action, 0x08, 0x10);
  }
  
@@ -39,15 +37,15 @@ index 70f722392cf50..45177c4eadad3 100644
  static void alc286_fixup_hp_gpio_led(struct hda_codec *codec,
                                const struct hda_fixup *fix, int action)
  {
-@@ -5749,6 +5755,7 @@ enum {
+@@ -5748,6 +5754,7 @@ enum {
+       ALC294_FIXUP_SPK2_TO_DAC1,
        ALC294_FIXUP_ASUS_DUAL_SPK,
-       ALC285_FIXUP_THINKPAD_HEADSET_JACK,
        ALC294_FIXUP_ASUS_HPE,
 +      ALC285_FIXUP_HP_GPIO_LED,
  };
  
  static const struct hda_fixup alc269_fixups[] = {
-@@ -6854,6 +6861,10 @@ static const struct hda_fixup alc269_fixups[] = {
+@@ -6847,6 +6854,10 @@ static const struct hda_fixup alc269_fix
                .chained = true,
                .chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
        },
@@ -58,7 +56,7 @@ index 70f722392cf50..45177c4eadad3 100644
  };
  
  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
-@@ -6998,6 +7009,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -6991,6 +7002,7 @@ static const struct snd_pci_quirk alc269
        SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
        SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
        SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
@@ -66,6 +64,3 @@ index 70f722392cf50..45177c4eadad3 100644
        SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
        SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
        SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
--- 
-2.25.1
-

diff --git a/queue-4.19/apparmor-don-t-try-to-replace-stale-label-in-ptracem.patch b/queue-4.19/apparmor-don-t-try-to-replace-stale-label-in-ptracem.patch
index 6e5bd7604328d6d4f598e6dcbbe9ddcce885620b..0f87cc340a7145c62893ad2d339c3cb3fcea426f 100644 (file)
--- a/queue-4.19/apparmor-don-t-try-to-replace-stale-label-in-ptracem.patch
+++ b/queue-4.19/apparmor-don-t-try-to-replace-stale-label-in-ptracem.patch
@@ -21,14 +21,12 @@ Signed-off-by: Jann Horn <jannh@google.com>
 Signed-off-by: John Johansen <john.johansen@canonical.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- security/apparmor/lsm.c | 4 ++--
+ security/apparmor/lsm.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 5e32fe434140e..898752b818dc5 100644
 --- a/security/apparmor/lsm.c
 +++ b/security/apparmor/lsm.c
-@@ -130,11 +130,11 @@ static int apparmor_ptrace_traceme(struct task_struct *parent)
+@@ -130,11 +130,11 @@ static int apparmor_ptrace_traceme(struc
        struct aa_label *tracer, *tracee;
        int error;
  
@@ -42,6 +40,3 @@ index 5e32fe434140e..898752b818dc5 100644
  
        return error;
  }
--- 
-2.25.1
-

diff --git a/queue-4.19/ib-mlx5-fix-devx-support-for-mlx5_cmd_op_init2init_q.patch b/queue-4.19/ib-mlx5-fix-devx-support-for-mlx5_cmd_op_init2init_q.patch
deleted file mode 100644 (file)
index cd589ee..0000000
--- a/queue-4.19/ib-mlx5-fix-devx-support-for-mlx5_cmd_op_init2init_q.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4a44f30b02b158dc9c7e91c00e5cadf78672031c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 May 2020 16:57:03 +0300
-Subject: IB/mlx5: Fix DEVX support for MLX5_CMD_OP_INIT2INIT_QP command
-
-From: Mark Zhang <markz@mellanox.com>
-
-[ Upstream commit d246a3061528be6d852156d25c02ea69d6db7e65 ]
-
-The commit citied in the Fixes line wasn't complete and solved
-only part of the problems. Update the mlx5_ib to properly support
-MLX5_CMD_OP_INIT2INIT_QP command in the DEVX, that is required when
-modify the QP tx_port_affinity.
-
-Fixes: 819f7427bafd ("RDMA/mlx5: Add init2init as a modify command")
-Link: https://lore.kernel.org/r/20200527135703.482501-1-leon@kernel.org
-Signed-off-by: Mark Zhang <markz@mellanox.com>
-Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
-Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
-Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/hw/mlx5/devx.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
-index 4c90a007e09db..bd8da83149dc5 100644
---- a/drivers/infiniband/hw/mlx5/devx.c
-+++ b/drivers/infiniband/hw/mlx5/devx.c
-@@ -211,6 +211,10 @@ static int devx_is_valid_obj_id(struct devx_obj *obj, const void *in)
-       case MLX5_CMD_OP_RST2INIT_QP:
-               obj_id = MLX5_GET(rst2init_qp_in, in, qpn);
-               break;
-+      case MLX5_CMD_OP_INIT2INIT_QP:
-+              obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_QP,
-+                                      MLX5_GET(init2init_qp_in, in, qpn));
-+              break;
-       case MLX5_CMD_OP_INIT2RTR_QP:
-               obj_id = MLX5_GET(init2rtr_qp_in, in, qpn);
-               break;
--- 
-2.25.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 498fafddf51290ec3f550eada01182b08d443cb3..49090678d4c6a8dea0335733d4a20458bd16979a 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -5,7 +5,6 @@ mtd-rawnand-marvell-fix-the-condition-on-a-return-co.patch
 net-bcmgenet-remove-hfb_ctrl-access.patch
 net-sched-export-__netdev_watchdog_up.patch
 edac-amd64-add-family-17h-model-30h-pci-ids.patch
-ib-mlx5-fix-devx-support-for-mlx5_cmd_op_init2init_q.patch
 i2c-tegra-cleanup-kerneldoc-comments.patch
 i2c-tegra-add-missing-kerneldoc-for-some-fields.patch
 i2c-tegra-fix-maximum-transfer-size.patch