Message ID | 87o8gctii6.fsf@mpe.ellerman.id.au (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | [GIT,PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag | expand |
On Mon, Feb 22, 2021 at 6:05 AM Michael Ellerman <mpe@ellerman.id.au> wrote: > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Hi Linus, > > Please pull powerpc updates for 5.12. > > There will be a conflict with the devicetree tree. It's OK to just take their > side of the conflict, we'll fix up the minor behaviour change that causes in a > follow-up patch. The issues turned out to be worse than just this, so I've dropped the conflicting change for 5.12. Rob
On Mon, Feb 22, 2021 at 4:06 AM Michael Ellerman <mpe@ellerman.id.au> wrote: > > Please pull powerpc updates for 5.12. Pulled. However: > mode change 100755 => 100644 tools/testing/selftests/powerpc/eeh/eeh-functions.sh > create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-aware.sh > create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-unaware.sh Somebody is being confused. Why create two new shell scripts with the proper executable bit, and then remove the executable bit from an existing one? That just seems very inconsistent. Linus
The pull request you sent on Mon, 22 Feb 2021 23:05:37 +1100:
> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-5.12-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b12b47249688915e987a9a2a393b522f86f6b7ab
Thank you!
On Tue, Feb 23, 2021 at 9:44 AM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Mon, Feb 22, 2021 at 4:06 AM Michael Ellerman <mpe@ellerman.id.au> wrote: > > > > Please pull powerpc updates for 5.12. > > Pulled. However: > > > mode change 100755 => 100644 tools/testing/selftests/powerpc/eeh/eeh-functions.sh > > create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-aware.sh > > create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-unaware.sh > > Somebody is being confused. > > Why create two new shell scripts with the proper executable bit, and > then remove the executable bit from an existing one? > > That just seems very inconsistent. eeh-function.sh just provides some helper functions for the other scripts and doesn't do anything when executed directly. I thought making it non-executable made sense. > > Linus
"Oliver O'Halloran" <oohall@gmail.com> writes: > On Tue, Feb 23, 2021 at 9:44 AM Linus Torvalds > <torvalds@linux-foundation.org> wrote: >> >> On Mon, Feb 22, 2021 at 4:06 AM Michael Ellerman <mpe@ellerman.id.au> wrote: >> > >> > Please pull powerpc updates for 5.12. >> >> Pulled. However: >> >> > mode change 100755 => 100644 tools/testing/selftests/powerpc/eeh/eeh-functions.sh >> > create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-aware.sh >> > create mode 100755 tools/testing/selftests/powerpc/eeh/eeh-vf-unaware.sh >> >> Somebody is being confused. >> >> Why create two new shell scripts with the proper executable bit, and >> then remove the executable bit from an existing one? >> >> That just seems very inconsistent. > > eeh-function.sh just provides some helper functions for the other > scripts and doesn't do anything when executed directly. I thought > making it non-executable made sense. Yeah I think it does make sense. It just looks a bit odd in the diffstat like this. Maybe if we called it lib.sh it would be more obvious? cheers
Rob Herring <robh@kernel.org> writes: > On Mon, Feb 22, 2021 at 6:05 AM Michael Ellerman <mpe@ellerman.id.au> wrote: >> >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA256 >> >> Hi Linus, >> >> Please pull powerpc updates for 5.12. >> >> There will be a conflict with the devicetree tree. It's OK to just take their >> side of the conflict, we'll fix up the minor behaviour change that causes in a >> follow-up patch. > > The issues turned out to be worse than just this, so I've dropped the > conflicting change for 5.12. OK, no worries. cheers