Message ID | 20210706210228.1229484-1-bjorn.andersson@linaro.org (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | [GIT,PULL] remoteproc updates for v5.14 | expand |
On Tue, Jul 6, 2021 at 2:02 PM Bjorn Andersson <bjorn.andersson@linaro.org> wrote: > > Suman Anna (6): > remoteproc: Add kernel-doc comment for is_iomem > remoteproc: Fix various kernel-doc warnings > remoteproc: k3-r5: Extend support to R5F clusters on AM64x SoCs > dt-bindings: remoteproc: qcom: pas: Fix indentation warnings > dt-bindings: remoteproc: pru: Update bindings for K3 AM64x SoCs > remoteproc: pru: Add support for various PRU cores on K3 AM64x SoCs Hmm. I see an additional commit dt-bindings: remoteproc: k3-r5f: Update bindings for AM64x SoCs and the diffstat I see differs by that extra DT binding too. If you end up adding commits to the end and updating the tag, please just let me know, so that I don't go "Hmm, this doesn't match the pull request" and have to go dig around what the difference is. Linus
On Wed, Jul 7, 2021 at 10:55 AM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > If you end up adding commits to the end and updating the tag [..] Actually, that's not what happened, the extra commit is in a separate branch that got merged early. So I'm not sure why your diffstat and shortlog were incorrect. Linus
On Wed 07 Jul 12:57 CDT 2021, Linus Torvalds wrote: > On Wed, Jul 7, 2021 at 10:55 AM Linus Torvalds > <torvalds@linux-foundation.org> wrote: > > > > If you end up adding commits to the end and updating the tag [..] > > Actually, that's not what happened, the extra commit is in a separate > branch that got merged early. So I'm not sure why your diffstat and > shortlog were incorrect. > Doing some backtracking on my actions found that I created an immutable branch for the dt-binding, tagged it, shared it with Suman and merged it into my branch. I missed this as I was preparing the pull request and didn't realize that my script for invoking the git request-pull would find this tag and thereby omit the content of that tag from the diffstat. Would you like me to resend this with a correct diffstat? Regards, Bjorn
On Wed, Jul 7, 2021 at 11:15 AM Bjorn Andersson <bjorn.andersson@linaro.org> wrote: > > Would you like me to resend this with a correct diffstat? No, I merged it - the main reason I check the diffstat and shortlog after-the-fact is just to make sure that I get what the pull requester _intended_, and that was fairly clear. It's not like the extra commit looked out of place in any other way. And the only problem with the mismatch is then that I waste time trying to figure out _why_ it didn't match. And that's already done, so water under the bridge.. So I just hope it doesn't happen again, because I'm just lazy and don't like that "Ok, now I need to figure out what's wrong" part. Linus
The pull request you sent on Tue, 6 Jul 2021 16:02:28 -0500:
> https://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git tags/rproc-v5.14
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d0fe3f47ef09bf5a74f7d20e129b2d15b4a824d0
Thank you!
On Wed 07 Jul 13:22 CDT 2021, Linus Torvalds wrote: > On Wed, Jul 7, 2021 at 11:15 AM Bjorn Andersson > <bjorn.andersson@linaro.org> wrote: > > > > Would you like me to resend this with a correct diffstat? > > No, I merged it - the main reason I check the diffstat and shortlog > after-the-fact is just to make sure that I get what the pull requester > _intended_, and that was fairly clear. It's not like the extra commit > looked out of place in any other way. > > And the only problem with the mismatch is then that I waste time > trying to figure out _why_ it didn't match. And that's already done, > so water under the bridge.. > > So I just hope it doesn't happen again, because I'm just lazy and > don't like that "Ok, now I need to figure out what's wrong" part. > I hope so too :) I've updated my scripts and will keep an eye on this going forward. Thanks, Bjorn