DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts #30

palash-gandhi · 2023-09-15T01:13:06Z

Problem

delphix/linux-kernel-aws#46 and it's side ports introduced a potential for merge conflicts in the base annotations file. If upstream changes that file, we are bound to hit a merge conflict when updating our repos because the include line is at the end of the file. Moving it to the top result in an unwanted configuration - where upstream's annotations overrides Delphix's annotations. We want Delphix's annotations to be processed at the very end.

Solution

delphix/linux-pkg#300 moves Delphix's custom annotations file into the linux-pkg repo. This change modifies the kernel repo to remove it.

Testing Done

See delphix/linux-pkg#300 for testing.

…licts PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

BugLink: https://bugs.launchpad.net/bugs/2120812 [ Upstream commit eedf3e3c2f2af55dca42b0ea81dffb808211d269 ] ACPICA commit 1c28da2242783579d59767617121035dafba18c3 This was originally done in NetBSD: NetBSD/src@b69d1ac and is the correct alternative to the smattering of `memcpy`s I previously contributed to this repository. This also sidesteps the newly strict checks added in UBSAN: llvm/llvm-project@7926744 Before this change we see the following UBSAN stack trace in Fuchsia: #0 0x000021afcfdeca5e in acpi_rs_get_address_common(struct acpi_resource*, union aml_resource*) ../../third_party/acpica/source/components/resources/rsaddr.c:329 <platform-bus-x86.so>+0x6aca5e #1.2 0x000021982bc4af3c in ubsan_get_stack_trace() compiler-rt/lib/ubsan/ubsan_diag.cpp:41 <libclang_rt.asan.so>+0x41f3c #1.1 0x000021982bc4af3c in maybe_print_stack_trace() compiler-rt/lib/ubsan/ubsan_diag.cpp:51 <libclang_rt.asan.so>+0x41f3c #1 0x000021982bc4af3c in ~scoped_report() compiler-rt/lib/ubsan/ubsan_diag.cpp:395 <libclang_rt.asan.so>+0x41f3c #2 0x000021982bc4bb6f in handletype_mismatch_impl() compiler-rt/lib/ubsan/ubsan_handlers.cpp:137 <libclang_rt.asan.so>+0x42b6f #3 0x000021982bc4b723 in __ubsan_handle_type_mismatch_v1 compiler-rt/lib/ubsan/ubsan_handlers.cpp:142 <libclang_rt.asan.so>+0x42723 #4 0x000021afcfdeca5e in acpi_rs_get_address_common(struct acpi_resource*, union aml_resource*) ../../third_party/acpica/source/components/resources/rsaddr.c:329 <platform-bus-x86.so>+0x6aca5e #5 0x000021afcfdf2089 in acpi_rs_convert_aml_to_resource(struct acpi_resource*, union aml_resource*, struct acpi_rsconvert_info*) ../../third_party/acpica/source/components/resources/rsmisc.c:355 <platform-bus-x86.so>+0x6b2089 #6 0x000021afcfded169 in acpi_rs_convert_aml_to_resources(u8*, u32, u32, u8, void**) ../../third_party/acpica/source/components/resources/rslist.c:137 <platform-bus-x86.so>+0x6ad169 #7 0x000021afcfe2d24a in acpi_ut_walk_aml_resources(struct acpi_walk_state*, u8*, acpi_size, acpi_walk_aml_callback, void**) ../../third_party/acpica/source/components/utilities/utresrc.c:237 <platform-bus-x86.so>+0x6ed24a #8 0x000021afcfde66b7 in acpi_rs_create_resource_list(union acpi_operand_object*, struct acpi_buffer*) ../../third_party/acpica/source/components/resources/rscreate.c:199 <platform-bus-x86.so>+0x6a66b7 #9 0x000021afcfdf6979 in acpi_rs_get_method_data(acpi_handle, const char*, struct acpi_buffer*) ../../third_party/acpica/source/components/resources/rsutils.c:770 <platform-bus-x86.so>+0x6b6979 #10 0x000021afcfdf708f in acpi_walk_resources(acpi_handle, char*, acpi_walk_resource_callback, void*) ../../third_party/acpica/source/components/resources/rsxface.c:731 <platform-bus-x86.so>+0x6b708f #11 0x000021afcfa95dcf in acpi::acpi_impl::walk_resources(acpi::acpi_impl*, acpi_handle, const char*, acpi::Acpi::resources_callable) ../../src/devices/board/lib/acpi/acpi-impl.cc:41 <platform-bus-x86.so>+0x355dcf #12 0x000021afcfaa8278 in acpi::device_builder::gather_resources(acpi::device_builder*, acpi::Acpi*, fidl::any_arena&, acpi::Manager*, acpi::device_builder::gather_resources_callback) ../../src/devices/board/lib/acpi/device-builder.cc:84 <platform-bus-x86.so>+0x368278 #13 0x000021afcfbddb87 in acpi::Manager::configure_discovered_devices(acpi::Manager*) ../../src/devices/board/lib/acpi/manager.cc:75 <platform-bus-x86.so>+0x49db87 #14 0x000021afcf99091d in publish_acpi_devices(acpi::Manager*, zx_device_t*, zx_device_t*) ../../src/devices/board/drivers/x86/acpi-nswalk.cc:95 <platform-bus-x86.so>+0x25091d #15 0x000021afcf9c1d4e in x86::X86::do_init(x86::X86*) ../../src/devices/board/drivers/x86/x86.cc:60 <platform-bus-x86.so>+0x281d4e #16 0x000021afcf9e33ad in λ(x86::X86::ddk_init::(anon class)*) ../../src/devices/board/drivers/x86/x86.cc:77 <platform-bus-x86.so>+0x2a33ad #17 0x000021afcf9e313e in fit::internal::target<(lambda at../../src/devices/board/drivers/x86/x86.cc:76:19), false, false, std::__2::allocator<std::byte>, void>::invoke(void*) ../../sdk/lib/fit/include/lib/fit/internal/function.h:183 <platform-bus-x86.so>+0x2a313e #18 0x000021afcfbab4c7 in fit::internal::function_base<16UL, false, void(), std::__2::allocator<std::byte>>::invoke(const fit::internal::function_base<16UL, false, void (), std::__2::allocator<std::byte> >*) ../../sdk/lib/fit/include/lib/fit/internal/function.h:522 <platform-bus-x86.so>+0x46b4c7 #19 0x000021afcfbab342 in fit::function_impl<16UL, false, void(), std::__2::allocator<std::byte>>::operator()(const fit::function_impl<16UL, false, void (), std::__2::allocator<std::byte> >*) ../../sdk/lib/fit/include/lib/fit/function.h:315 <platform-bus-x86.so>+0x46b342 #20 0x000021afcfcd98c3 in async::internal::retained_task::Handler(async_dispatcher_t*, async_task_t*, zx_status_t) ../../sdk/lib/async/task.cc:24 <platform-bus-x86.so>+0x5998c3 #21 0x00002290f9924616 in λ(const driver_runtime::Dispatcher::post_task::(anon class)*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, zx_status_t) ../../src/devices/bin/driver_runtime/dispatcher.cc:789 <libdriver_runtime.so>+0x10a616 #22 0x00002290f9924323 in fit::internal::target<(lambda at../../src/devices/bin/driver_runtime/dispatcher.cc:788:7), true, false, std::__2::allocator<std::byte>, void, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request>>, int>::invoke(void*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int) ../../sdk/lib/fit/include/lib/fit/internal/function.h:128 <libdriver_runtime.so>+0x10a323 #23 0x00002290f9904b76 in fit::internal::function_base<24UL, true, void(std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request>>, int), std::__2::allocator<std::byte>>::invoke(const fit::internal::function_base<24UL, true, void (std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int) ../../sdk/lib/fit/include/lib/fit/internal/function.h:522 <libdriver_runtime.so>+0xeab76 #24 0x00002290f9904831 in fit::callback_impl<24UL, true, void(std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request>>, int), std::__2::allocator<std::byte>>::operator()(fit::callback_impl<24UL, true, void (std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int) ../../sdk/lib/fit/include/lib/fit/function.h:471 <libdriver_runtime.so>+0xea831 #25 0x00002290f98d5adc in driver_runtime::callback_request::Call(driver_runtime::callback_request*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, zx_status_t) ../../src/devices/bin/driver_runtime/callback_request.h:74 <libdriver_runtime.so>+0xbbadc #26 0x00002290f98e1e58 in driver_runtime::Dispatcher::dispatch_callback(driver_runtime::Dispatcher*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >) ../../src/devices/bin/driver_runtime/dispatcher.cc:1248 <libdriver_runtime.so>+0xc7e58 #27 0x00002290f98e4159 in driver_runtime::Dispatcher::dispatch_callbacks(driver_runtime::Dispatcher*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../src/devices/bin/driver_runtime/dispatcher.cc:1308 <libdriver_runtime.so>+0xca159 #28 0x00002290f9918414 in λ(const driver_runtime::Dispatcher::create_with_adder::(anon class)*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../src/devices/bin/driver_runtime/dispatcher.cc:353 <libdriver_runtime.so>+0xfe414 #29 0x00002290f991812d in fit::internal::target<(lambda at../../src/devices/bin/driver_runtime/dispatcher.cc:351:7), true, false, std::__2::allocator<std::byte>, void, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter>>, fbl::ref_ptr<driver_runtime::Dispatcher>>::invoke(void*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../sdk/lib/fit/include/lib/fit/internal/function.h:128 <libdriver_runtime.so>+0xfe12d #30 0x00002290f9906fc7 in fit::internal::function_base<8UL, true, void(std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter>>, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte>>::invoke(const fit::internal::function_base<8UL, true, void (std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../sdk/lib/fit/include/lib/fit/internal/function.h:522 <libdriver_runtime.so>+0xecfc7 #31 0x00002290f9906c66 in fit::function_impl<8UL, true, void(std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter>>, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte>>::operator()(const fit::function_impl<8UL, true, void (std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../sdk/lib/fit/include/lib/fit/function.h:315 <libdriver_runtime.so>+0xecc66 #32 0x00002290f98e73d9 in driver_runtime::Dispatcher::event_waiter::invoke_callback(driver_runtime::Dispatcher::event_waiter*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../src/devices/bin/driver_runtime/dispatcher.h:543 <libdriver_runtime.so>+0xcd3d9 #33 0x00002290f98e700d in driver_runtime::Dispatcher::event_waiter::handle_event(std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, async_dispatcher_t*, async::wait_base*, zx_status_t, zx_packet_signal_t const*) ../../src/devices/bin/driver_runtime/dispatcher.cc:1442 <libdriver_runtime.so>+0xcd00d #34 0x00002290f9918983 in async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>::handle_event(async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>*, async_dispatcher_t*, async::wait_base*, zx_status_t, zx_packet_signal_t const*) ../../src/devices/bin/driver_runtime/async_loop_owned_event_handler.h:59 <libdriver_runtime.so>+0xfe983 #35 0x00002290f9918b9e in async::wait_method<async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>, &async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>::handle_event>::call_handler(async_dispatcher_t*, async_wait_t*, zx_status_t, zx_packet_signal_t const*) ../../sdk/lib/async/include/lib/async/cpp/wait.h:201 <libdriver_runtime.so>+0xfeb9e #36 0x00002290f99bf509 in async_loop_dispatch_wait(async_loop_t*, async_wait_t*, zx_status_t, zx_packet_signal_t const*) ../../sdk/lib/async-loop/loop.c:394 <libdriver_runtime.so>+0x1a5509 #37 0x00002290f99b9958 in async_loop_run_once(async_loop_t*, zx_time_t) ../../sdk/lib/async-loop/loop.c:343 <libdriver_runtime.so>+0x19f958 #38 0x00002290f99b9247 in async_loop_run(async_loop_t*, zx_time_t, _Bool) ../../sdk/lib/async-loop/loop.c:301 <libdriver_runtime.so>+0x19f247 #39 0x00002290f99ba962 in async_loop_run_thread(void*) ../../sdk/lib/async-loop/loop.c:860 <libdriver_runtime.so>+0x1a0962 #40 0x000041afd176ef30 in start_c11(void*) ../../zircon/third_party/ulib/musl/pthread/pthread_create.c:63 <libc.so>+0x84f30 #41 0x000041afd18a448d in thread_trampoline(uintptr_t, uintptr_t) ../../zircon/system/ulib/runtime/thread.cc:100 <libc.so>+0x1ba48d Link: acpica/acpica@1c28da22 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://patch.msgid.link/4664267.LvFx2qVVIh@rjwysocki.net Signed-off-by: Tamir Duberstein <tamird@gmail.com> [ rjw: Pick up the tag from Tamir ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Noah Wager <noah.wager@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

bc916c0

…licts PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

palash-gandhi force-pushed the dlpx/pr/palash-delphix/9a67e0a1-6557-4d88-a372-be493a23929a branch from 6322b3e to bc916c0 Compare September 15, 2023 01:13

palash-gandhi marked this pull request as ready for review September 15, 2023 01:16

palash-gandhi mentioned this pull request Sep 15, 2023

DLPX-87969 Modify kernel build to include Delphix's custom annotations delphix/linux-pkg#300

Merged

sebroy approved these changes Sep 15, 2023

View reviewed changes

prakashsurya approved these changes Sep 15, 2023

View reviewed changes

palash-gandhi merged commit f3bc9e5 into develop Sep 19, 2023

palash-gandhi deleted the dlpx/pr/palash-delphix/9a67e0a1-6557-4d88-a372-be493a23929a branch September 19, 2023 15:03

delphix-devops-bot pushed a commit that referenced this pull request Oct 5, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

fa41209

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Oct 10, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

7bd5787

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Oct 11, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

69a4c8a

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Oct 27, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

655c1bf

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Oct 28, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

bc3fc8d

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Nov 1, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

f6d7afe

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Nov 2, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

ffaa742

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Nov 22, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

3a78f9e

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Dec 9, 2023

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

abc554d

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Feb 8, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

dd5fb85

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Feb 9, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

5fc22d1

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Feb 24, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

109c29f

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Mar 21, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

b4d2cd2

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Mar 27, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

3404e56

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

jwk404 pushed a commit that referenced this pull request Apr 14, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

8cf7041

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

jwk404 pushed a commit that referenced this pull request Apr 15, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

0d14af7

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

jwk404 pushed a commit that referenced this pull request Apr 15, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

bde0bab

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

jwk404 pushed a commit that referenced this pull request Apr 15, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

ce323e0

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Apr 20, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

d0959ee

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request May 9, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

9f51cd0

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request May 10, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

db40b67

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request May 11, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

fc169be

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/30

delphix-devops-bot pushed a commit that referenced this pull request Aug 15, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

53c1846

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Aug 24, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

fd6b1ce

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

prakashsurya pushed a commit that referenced this pull request Sep 23, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

d87ce06

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Oct 20, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

0b85696

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

palash-gandhi added a commit that referenced this pull request Oct 24, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

72ca412

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Nov 10, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

0650beb

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 18, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

4a3d42d

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 19, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

8df29c8

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 20, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

5ca031b

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 21, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

61356df

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 22, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

004fcef

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 23, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

e566315

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 24, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

9b5b56a

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 25, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

8f031ae

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 26, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

ca0c40d

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 27, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

03d470a

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 28, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

79a9d6b

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 29, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

7c3b1f2

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 30, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

7a492ff

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Dec 31, 2024

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

fe998d4

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 1, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

5722491

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 2, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

c024e7f

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 3, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

660fbd4

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 4, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

4de0ae5

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 5, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

03e045f

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 6, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

55434c1

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 7, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

ff2b45a

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 30, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

652eeaf

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

delphix-devops-bot pushed a commit that referenced this pull request Jan 31, 2025

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

3acae2f

…licts (#30) PR URL: https://www.github.com/delphix/linux-kernel-oracle/pull/33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts #30

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts #30

Uh oh!

palash-gandhi commented Sep 15, 2023 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts #30

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts #30

Uh oh!

Conversation

palash-gandhi commented Sep 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Testing Done

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

palash-gandhi commented Sep 15, 2023 •

edited

Loading