Re: [PATCH v3] opp: Use clk_get_optional() to avoid leaving opp_table->clk as an error pointer

On 27-07-26, 15:11, Praveen Talari wrote:
> I have followed below steps but faced conflict while rebasing it.
> 
> git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> git remote add viresh
> https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
> git fetch viresh
> git rebase viresh/cpufreq/arm/linux-next
> 
> $git rebase viresh/cpufreq/arm/linux-next
> Auto-merging drivers/gpio/gpio-shared-proxy.c
> CONFLICT (content): Merge conflict in drivers/gpio/gpio-shared-proxy.c
> error: could not apply efecde8a254d... gpio: shared-proxy: always serialize
> with a sleeping mutex
> hint: Resolve all conflicts manually, mark them as resolved with
> hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
> hint: You can instead skip this commit: run "git rebase --skip".
> hint: To abort and get back to the state before "git rebase", run "git
> rebase --abort".
> 
> Could not apply efecde8a254d... gpio: shared-proxy: always serialize with a
> sleeping mutex

Looks like you are trying to rebase Linus's master branch over my
branch ? This commit is already merged in the kernel and you shouldn't
be rebasing it over.

Please apply the $subject patch only over my branch, maybe with git
cherry-pick, and then send me the same.

> How to proceed further?

-- 
viresh