On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote: > Thanks, I will resent with [PATCH net-next v9]. > My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch. > > [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@xxxxxxxxxxxxxxxx > [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@xxxxxxxxxxxxxxxx > > Do I need to remove their context? If the conflict is just on MAINTAINERS it should be safe to ignore. Resend your patches on top of net-next as if their patches didn't exist. Stephen/Linus will have not trouble resolving the conflict.
