From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1800
The merge window exposed a bug in the redhat/self-test/data/create-data.sh
script where the local variables were being reported instead of the test
variables.
Fix the create-data.sh script by moving the reporting of the
Makefile.variables into the dist-dump-variables target. This has the
minor annoyance that dist-dump-variables will report Makefile.variables
twice when executed on the command line, however, it's something I think
we can live with.
In addition, the "Makefile contents" test needs to be adjusted because a
"?=" now appears in the redhat/Makefile.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/self-test/data/centos-2585cf9dfaad.el7 | 36 ++++++++----------------
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 36 ++++++++----------------
redhat/self-test/data/centos-78e36f3b0dae.el7 | 34 +++++++----------------
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 34 +++++++----------------
redhat/self-test/data/centos-df0cc57e057f.el7 | 36 ++++++++----------------
redhat/self-test/data/centos-df0cc57e057f.fc25 | 36 ++++++++----------------
redhat/self-test/data/centos-fce15c45d3fb.el7 | 34 +++++++----------------
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 34 +++++++----------------
redhat/self-test/data/create-data.sh | 35 +++++++++++-------------
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 37 +++++++++----------------
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 37 +++++++++----------------
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 35 ++++++++----------------
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 35 ++++++++----------------
redhat/self-test/data/fedora-df0cc57e057f.el7 | 37 +++++++++----------------
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 37 +++++++++----------------
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 35 ++++++++----------------
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 35 ++++++++----------------
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 37 +++++++++----------------
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 37 +++++++++----------------
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 35 ++++++++----------------
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 35 ++++++++----------------
redhat/self-test/data/rhel-df0cc57e057f.el7 | 37 +++++++++----------------
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 37 +++++++++----------------
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 35 ++++++++----------------
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 35 ++++++++----------------
redhat/self-test/2001-dist-release.bats | 2 +-
redhat/self-test/3001-Makefile-contents.bats | 2 +-
redhat/Makefile | 3 +-
28 files changed, 312 insertions(+), 586 deletions(-)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1800
The merge window exposed a bug in the redhat/self-test/data/create-data.sh
script where the local variables were being reported instead of the test
variables.
Fix the create-data.sh script by moving the reporting of the
Makefile.variables into the dist-dump-variables target. This has the
minor annoyance that dist-dump-variables will report Makefile.variables
twice when executed on the command line, however, it's something I think
we can live with.
In addition, the "Makefile contents" test needs to be adjusted because a
"?=" now appears in the redhat/Makefile.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/self-test/data/centos-2585cf9dfaad.el7 | 36 ++++++++----------------
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 36 ++++++++----------------
redhat/self-test/data/centos-78e36f3b0dae.el7 | 34 +++++++----------------
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 34 +++++++----------------
redhat/self-test/data/centos-df0cc57e057f.el7 | 36 ++++++++----------------
redhat/self-test/data/centos-df0cc57e057f.fc25 | 36 ++++++++----------------
redhat/self-test/data/centos-fce15c45d3fb.el7 | 34 +++++++----------------
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 34 +++++++----------------
redhat/self-test/data/create-data.sh | 35 +++++++++++-------------
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 37 +++++++++----------------
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 37 +++++++++----------------
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 35 ++++++++----------------
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 35 ++++++++----------------
redhat/self-test/data/fedora-df0cc57e057f.el7 | 37 +++++++++----------------
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 37 +++++++++----------------
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 35 ++++++++----------------
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 35 ++++++++----------------
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 37 +++++++++----------------
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 37 +++++++++----------------
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 35 ++++++++----------------
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 35 ++++++++----------------
redhat/self-test/data/rhel-df0cc57e057f.el7 | 37 +++++++++----------------
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 37 +++++++++----------------
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 35 ++++++++----------------
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 35 ++++++++----------------
redhat/self-test/2001-dist-release.bats | 2 +-
redhat/self-test/3001-Makefile-contents.bats | 2 +-
redhat/Makefile | 2 +
28 files changed, 312 insertions(+), 585 deletions(-)
From: Jason Wang <jasowang(a)redhat.com>
virtio-rng: make device ready before making request
Current virtio-rng does a entropy request before DRIVER_OK, this
violates the spec:
virtio spec requires that all drivers set DRIVER_OK
before using devices.
Further, kernel will ignore the interrupt after commit
8b4ec69d7e09 ("virtio: harden vring IRQ").
Fixing this by making device ready before the request.
Cc: stable(a)vger.kernel.org
Fixes: 8b4ec69d7e09 ("virtio: harden vring IRQ")
Fixes: f7f510ec1957 ("virtio: An entropy device, as suggested by hpa.")
Reported-and-tested-by: syzbot+5b59d6d459306a556f54(a)syzkaller.appspotmail.com
Signed-off-by: Jason Wang <jasowang(a)redhat.com>
Message-Id: <20220608061422.38437-1-jasowang(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
Reviewed-by: Laurent Vivier <lvivier(a)redhat.com>
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index blahblah..blahblah 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -159,6 +159,8 @@ static int probe_common(struct virtio_device *vdev)
goto err_find;
}
+ virtio_device_ready(vdev);
+
/* we always have a pending entropy request */
request_entropy(vi);
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1861
From: vse vaw on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1871
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
This reverts commit 75d5231a55c57ce92b27a309327c316930365ac7
---
drivers/iommu/intel/iommu.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)