diff options
| author |   Paul Barker <paul.barker@sancloud.com> | 2022-10-05 17:36:05 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-10-08 21:51:34 +0000 |
| commit | 3279287bd1943ba23d7a511109ea4ff053eaad8c (patch) | |
| tree | 4f6801ceb47c67783be9b14f1b96e02839f2c9fd /meta-agl-bsp/meta-sancloud/recipes-kernel/linux | |
| parent | cf20f2f0db0f8de8272bf0b1038c98197af793c5 (diff) | |
Revert "meta-agl-bsp: meta-sancloud: Revert problematic kernel commit"
This reverts commit a12a83ebdfcd4287264e50edf3b11a156f418ae9. The patch
is no longer needed as the kernel version used by linux-bbe has been
updated.
Change-Id: I2ea6fd05b99018517fb2e1f3f03153dfd4ccd0e8
Signed-off-by: Paul Barker <paul.barker@sancloud.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28043
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
(cherry picked from commit c26d7bc391257f078a4c64a42d5c95ac98dcb3ab)
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27935
Diffstat (limited to 'meta-agl-bsp/meta-sancloud/recipes-kernel/linux')
2 files changed, 0 insertions, 49 deletions
diff --git a/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe/0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch b/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe/0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch deleted file mode 100644 index 3b92bc350..000000000 --- a/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe/0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 36b3d70d866d6781db4ab4c575b8bdab79244c7f Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Thu, 16 Sep 2021 10:17:11 +0200 -Subject: [PATCH] Revert "block: nbd: add sanity check for first_minor" - -This reverts commit 4b21d4e820bb9a1415ec76dfe565e4c5937337dd which is -commit b1a811633f7321cf1ae2bb76a66805b7720e44c9 upstream. - -The backport of this is reported to be causing some problems, so revert -this for now until they are worked out. - -Link: https://lore.kernel.org/r/CACPK8XfUWoOHr-0RwRoYoskia4fbAbZ7DYf5wWBnv6qUnGq18w@mail.gmail.com -Reported-by: Joel Stanley <joel@jms.id.au> -Cc: Christoph Hellwig <hch@lst.de> -Cc: Pavel Skripkin <paskripkin@gmail.com> -Cc: Jens Axboe <axboe@kernel.dk> -Cc: Sasha Levin <sashal@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/block/nbd.c | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c -index 98274ba0701d..59c452fff835 100644 ---- a/drivers/block/nbd.c -+++ b/drivers/block/nbd.c -@@ -1759,17 +1759,7 @@ static int nbd_dev_add(int index) - refcount_set(&nbd->refs, 1); - INIT_LIST_HEAD(&nbd->list); - disk->major = NBD_MAJOR; -- -- /* Too big first_minor can cause duplicate creation of -- * sysfs files/links, since first_minor will be truncated to -- * byte in __device_add_disk(). -- */ - disk->first_minor = index << part_shift; -- if (disk->first_minor > 0xff) { -- err = -EINVAL; -- goto out_free_idr; -- } -- - disk->fops = &nbd_fops; - disk->private_data = nbd; - sprintf(disk->disk_name, "nbd%d", index); --- -2.34.1 - diff --git a/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend b/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend index d5e19efd4..b3709a24b 100644 --- a/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend +++ b/meta-agl-bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_%.bbappend @@ -3,5 +3,3 @@ require recipes-kernel/linux/linux-agl.inc FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" AGL_KCONFIG_FRAGMENTS += "cma-256.cfg" - -SRC_URI += "file://0001-Revert-block-nbd-add-sanity-check-for-first_minor.patch" |