DLPX-91748 Merge conflict in linux-kernel-aws#50
Merged
Conversation
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2026491 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2029289 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2030549 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
This is benign since hooks.mk already sets this flag, but it is confusing nonetheless. Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2030383 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2034162 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2033782 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2036533 Properties: no-test-build Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2038169 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2038014 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2041907 Properties: no-test-build Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Bethany Jamison <bethany.jamison@canonical.com>
Ignore: yes Signed-off-by: Bethany Jamison <bethany.jamison@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2055586 Properties: no-test-build Signed-off-by: Bethany Jamison <bethany.jamison@canonical.com>
…(main/2024.03.04) BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Bethany Jamison <bethany.jamison@canonical.com>
Signed-off-by: Bethany Jamison <bethany.jamison@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Yuxuan Luo <yuxuan.luo@canonical.com>
Ignore: yes Signed-off-by: Yuxuan Luo <yuxuan.luo@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2059636 Properties: no-test-build Signed-off-by: Yuxuan Luo <yuxuan.luo@canonical.com>
Signed-off-by: Yuxuan Luo <yuxuan.luo@canonical.com>
Ignore: yes Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2061761 Properties: no-test-build Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Ignore: yes Signed-off-by: Philip Cox <philip.cox@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2063583 Properties: no-test-build Signed-off-by: Philip Cox <philip.cox@canonical.com>
Signed-off-by: Philip Cox <philip.cox@canonical.com>
Ignore: yes Signed-off-by: Philip Cox <philip.cox@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2063711 Properties: no-test-build Signed-off-by: Philip Cox <philip.cox@canonical.com>
Signed-off-by: Philip Cox <philip.cox@canonical.com>
Ignore: yes Signed-off-by: Philip Cox <philip.cox@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2068190 Properties: no-test-build Signed-off-by: Philip Cox <philip.cox@canonical.com>
Signed-off-by: Philip Cox <philip.cox@canonical.com>
Ignore: yes Signed-off-by: Philip Cox <philip.cox@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2068344 Properties: no-test-build Signed-off-by: Philip Cox <philip.cox@canonical.com>
…el-versions (main/2024.06.10) BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Philip Cox <philip.cox@canonical.com>
Signed-off-by: Philip Cox <philip.cox@canonical.com>
mmaybee
approved these changes
Jul 26, 2024
sebroy
approved these changes
Jul 26, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Conflicts
Take upstream
Take upstream version of zfs, and remove v4l2 line
This file was extensively reworked upstream in a37f08b, 43d1d00, c658797, 12ece15 and d66bb42.
Taking the upstream version of all changes.
In DLPX-82827, we bumped NFSD_MAX_OPS_PER_COMPOUND from 16 to 40.
Upstream just bumped it to 50 for the same reason. Take upstream.
Testing Done
http://selfservice.jenkins.delphix.com/job/appliance-build-orchestrator-pre-push/9010/
The ZFS failures were only in zloop.