Hi Jacob, Can you please help me with the branch name that I should rebase? Last time I rebased to "dev-queue" branch of "git clone git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git".
Let me know, if I should use a different branch for rebasing. Thanks Anil -----Original Message----- From: Keller, Jacob E <jacob.e.kel...@intel.com> Sent: Friday, May 24, 2024 2:11 PM To: Samal, Anil <anil.sa...@intel.com>; intel-wired-...@lists.osuosl.org Cc: net...@vger.kernel.org; Pepiak, Leszek <leszek.pep...@intel.com>; Kitszel, Przemyslaw <przemyslaw.kits...@intel.com>; Czapnik, Lukasz <lukasz.czap...@intel.com>; Nguyen, Anthony L <anthony.l.ngu...@intel.com> Subject: Re: [PATCH iwl-next v3 0/3] ice:Support to dump PHY config, FEC On 5/24/2024 6:51 AM, Anil Samal wrote: > Implementation to dump PHY configuration and FEC statistics to > facilitate link level debugging of customer issues. Implementation > has two parts > What commit is this based off of? I believe we have slightly conflicting work already queued in IWL next-queue, and the NIPA automation is unable to apply this series for testing: > [IWL-NIPA] Patch: https://patchwork.ozlabs.org/patch/1939088 > Pass: 1 Warn: 0 Fail: 1 > > Patch: https://patchwork.ozlabs.org/patch/1939088 > results path: results/408098/1939088 > > Test: apply > Fail - Patch does not apply to next-queue > > Test: tree_selection > Okay - Clearly marked for next-queue Normally, basing directly on net-next is fine. Unfortunately, I am having trouble properly resolving the conflicts with the work on the queue already. If you could rebase this on top of dev-queue [1] that would be appreciated. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git/commit/?h=dev-queue
