diff --git a/debian.master/abi/modules.ignore b/debian.master/abi/modules.ignore index 987d577ec9e8..639982544fb2 100644 --- a/debian.master/abi/modules.ignore +++ b/debian.master/abi/modules.ignore @@ -9,3 +9,4 @@ znvpair zpios zunicode zzstd +v4l2loopback diff --git a/debian.master/changelog b/debian.master/changelog index 834b4723df71..83e9eab75bd4 100644 --- a/debian.master/changelog +++ b/debian.master/changelog @@ -1,14 +1,17 @@ -linux-unstable (5.18.0-1.1) UNRELEASED; urgency=medium +linux-unstable (5.18.0-1.1) jammy; urgency=medium - CHANGELOG: Do not edit directly. Autogenerated at release. - CHANGELOG: Use the printchanges target to see the curent changes. - CHANGELOG: Use the insertchanges target to create the final log. + * kinetic/linux-unstable: 5.18.0-1.1 -proposed tracker (LP: #1969476) + + * Miscellaneous Ubuntu changes + - [Config] update configs and annotations after rebase to 5.18 + - [Packaging] temporarily disable zfs + - [Packaging] temporarily disable v4l2loopback [ Upstream Kernel Changes ] * Rebase to v5.18-rc3 - -- Andrea Righi Tue, 19 Apr 2022 16:22:15 +0200 + -- Andrea Righi Wed, 27 Apr 2022 20:26:42 +0200 linux-unstable (5.18.0-0.0) jammy; urgency=medium diff --git a/debian.master/reconstruct b/debian.master/reconstruct index 3ec11ceea9a6..ca916d098dab 100644 --- a/debian.master/reconstruct +++ b/debian.master/reconstruct @@ -1,58 +1 @@ -# Recreate any symlinks created since the orig. -# Remove any files deleted from the orig. -rm -f 'drivers/cxl/core/bus.c' -rm -f 'drivers/net/dsa/realtek-smi-core.c' -rm -f 'drivers/net/dsa/realtek-smi-core.h' -rm -f 'drivers/net/dsa/rtl8365mb.c' -rm -f 'drivers/net/dsa/rtl8366.c' -rm -f 'drivers/net/dsa/rtl8366rb.c' -chmod +x 'debian/cloud-tools/hv_get_dhcp_info' -chmod +x 'debian/cloud-tools/hv_get_dns_info' -chmod +x 'debian/cloud-tools/hv_set_ifconfig' -chmod +x 'debian/rules' -chmod +x 'debian/scripts/abi-check' -chmod +x 'debian/scripts/config-check' -chmod +x 'debian/scripts/control-create' -chmod +x 'debian/scripts/dkms-build' -chmod +x 'debian/scripts/dkms-build--nvidia-N' -chmod +x 'debian/scripts/file-downloader' -chmod +x 'debian/scripts/helpers/close' -chmod +x 'debian/scripts/helpers/open' -chmod +x 'debian/scripts/helpers/rebase' -chmod +x 'debian/scripts/link-headers' -chmod +x 'debian/scripts/misc/arch-has-odm-enabled.sh' -chmod +x 'debian/scripts/misc/final-checks' -chmod +x 'debian/scripts/misc/find-missing-sauce.sh' -chmod +x 'debian/scripts/misc/fw-to-ihex.sh' -chmod +x 'debian/scripts/misc/gen-auto-reconstruct' -chmod +x 'debian/scripts/misc/getabis' -chmod +x 'debian/scripts/misc/git-ubuntu-log' -chmod +x 'debian/scripts/misc/insert-changes' -chmod +x 'debian/scripts/misc/insert-mainline-changes' -chmod +x 'debian/scripts/misc/insert-ubuntu-changes' -chmod +x 'debian/scripts/misc/kernelconfig' -chmod +x 'debian/scripts/misc/retag' -chmod +x 'debian/scripts/misc/splitconfig.pl' -chmod +x 'debian/scripts/misc/tristate.sh' -chmod +x 'debian/scripts/misc/update-aufs.sh' -chmod +x 'debian/scripts/module-check' -chmod +x 'debian/scripts/module-inclusion' -chmod +x 'debian/scripts/retpoline-check' -chmod +x 'debian/scripts/retpoline-extract' -chmod +x 'debian/scripts/retpoline-extract-one' -chmod +x 'debian/templates/extra.postinst.in' -chmod +x 'debian/templates/extra.postrm.in' -chmod +x 'debian/templates/headers.postinst.in' -chmod +x 'debian/templates/image.postinst.in' -chmod +x 'debian/templates/image.postrm.in' -chmod +x 'debian/templates/image.preinst.in' -chmod +x 'debian/templates/image.prerm.in' -chmod +x 'debian/tests-build/check-aliases' -chmod +x 'debian/tests/rebuild' -chmod +x 'debian/tests/ubuntu-regression-suite' -chmod +x 'drivers/watchdog/f71808e_wdt.c' -chmod +x 'scripts/pahole-version.sh' -chmod +x 'tools/perf/tests/shell/test_arm_callgraph_fp.sh' -chmod +x 'update-dkms-versions' -chmod +x 'update-version-dkms' exit 0