| Message ID | 20221122203635.v2.1.Ie05fd439d0b271b927acb25c2a6e41af7a927e90@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/2] dt-bindings: arm: qcom: Adding DT binding for zombie | expand |
On Tue, Nov 22, 2022 at 08:37:02PM +0800, Owen Yang wrote: > Add an entry in the device tree binding for sc7280-zombie. nit: s/an entry/entries/ (there are two of them) > > Documentation/devicetree/bindings/arm/qcom.yaml Drop this > > Signed-off-by: Owen Yang <ecs.taipeikernel@gmail.com> > --- > > Changes in v2: > - Move binding item to Google series bottom. > - Modify DT file for zombie. > > Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml > index c15a729a6852..f617923f7485 100644 > --- a/Documentation/devicetree/bindings/arm/qcom.yaml > +++ b/Documentation/devicetree/bindings/arm/qcom.yaml > @@ -538,6 +538,16 @@ properties: > - const: google,villager-sku512 > - const: qcom,sc7280 > > + - description: Google Zombie (newest rev) > + items: > + - const: google,zombie > + - const: qcom,sc7280 > + > + - description: Google Zombie with LTE (newest rev) > + items: > + - const: google,zombie-sku512 > + - const: qcom,sc7280 > + > - items: > - enum: > - xiaomi,lavender > -- > 2.17.1 >
On which tree is this series based? My earlier reply bounced for Bjorn's old Linaro e-mail address, which suggests that the series might be based on an older kernel tree (maybe downstream Chrome OS v5.15?). Please make sure to base patches to upstream lists on the corresponding maintainer tree/branch or a recent kernel version/rc. On Tue, Nov 22, 2022 at 08:37:02PM +0800, Owen Yang wrote: > Add an entry in the device tree binding for sc7280-zombie. > > Documentation/devicetree/bindings/arm/qcom.yaml > > Signed-off-by: Owen Yang <ecs.taipeikernel@gmail.com> > --- > > Changes in v2: > - Move binding item to Google series bottom. > - Modify DT file for zombie. > > Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml > index c15a729a6852..f617923f7485 100644 > --- a/Documentation/devicetree/bindings/arm/qcom.yaml > +++ b/Documentation/devicetree/bindings/arm/qcom.yaml > @@ -538,6 +538,16 @@ properties: > - const: google,villager-sku512 > - const: qcom,sc7280 > > + - description: Google Zombie (newest rev) > + items: > + - const: google,zombie > + - const: qcom,sc7280 > + > + - description: Google Zombie with LTE (newest rev) > + items: > + - const: google,zombie-sku512 > + - const: qcom,sc7280 > + > - items: > - enum: > - xiaomi,lavender > -- > 2.17.1 >
On Wed, Nov 23, 2022 at 02:02:38PM +0800, 楊宗翰 wrote: > Hi Matthias , > > When I run "patman" still get warning "<patch>:36: warning: added, moved or > deleted file(s), does MAINTAINERS need updating?" The warning is expected because you added new files. In this case you can ignore it as it isn't expected that you become the maintainer of the new zombie DT files. > And I screenshot my "git gui" as below(attachment "git_gui_screenshot.jpg"): > [image.png] > > The latest git log info as below: > --- > commit 4d2b529bce125b83c546aebbc36ecedf76dfc55e (linux_qcom/for-next) > Merge: 9abf2313adc1 c03fa428ac6e afcd946be11c aec5f36cf676 cea42b8d7966 > aa9f474014b1 37b5e8c48b9d cadaa773bcf1 > Author: Bjorn Andersson <andersson@kernel.org> > Date:  Tue Nov 15 11:45:55 2022 -0600 > >   Merge branches 'arm64-defconfig-for-6.2', 'arm64-for-6.2', 'clk-for-6.2', > 'defconfig-for-6.2', 'drivers-for-6.2', 'dts-for-6.2' and 'arm64-fixes-for-6.1' > into for-next > --- > > My checkout steps as below: > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/ > qcom/linux.git > $ git fetch --no-tags linux_qcom > $ git checkout -b <MyLocalBranchName> linux_qcom/for-next > > Is my code base branch still worng? Am I missing something? My understanding is that it is best to base you changes on a branch like 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes land in one of the '${area}-for-${version}' branches. No big issue in this case, just use the corresponding '${area}-for-${version}' branch for future patches/versions :) > The attachment is "0001-dt-bindings-arm-qcom-Adding-DT-binding-for- > zombie.patch" patch file, >  I have drop "Documentation/devicetree/bindings/arm/qcom.yaml" as your advice. > > Matthias Kaehlcke <mka@chromium.org> æ¼ 2022å¹´11æ22æ¥ é±äº æä¸10: > 28寫éï¼ > On which tree is this series based? My earlier reply bounced for > Bjorn's > old Linaro e-mail address, which suggests that the series might be > based > on an older kernel tree (maybe downstream Chrome OS v5.15?). Please > make > sure to base patches to upstream lists on the corresponding > maintainer > tree/branch or a recent kernel version/rc. > > On Tue, Nov 22, 2022 at 08:37:02PM +0800, Owen Yang wrote: > > Add an entry in the device tree binding for sc7280-zombie. > > > > Documentation/devicetree/bindings/arm/qcom.yaml > > > > Signed-off-by: Owen Yang <ecs.taipeikernel@gmail.com> > > --- > > > > Changes in v2: > > - Move binding item to Google series bottom. > > - Modify DT file for zombie. > > > > Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/ > Documentation/devicetree/bindings/arm/qcom.yaml > > index c15a729a6852..f617923f7485 100644 > > --- a/Documentation/devicetree/bindings/arm/qcom.yaml > > +++ b/Documentation/devicetree/bindings/arm/qcom.yaml > > @@ -538,6 +538,16 @@ properties: > >      - const: google,villager-sku512 > >      - const: qcom,sc7280 > > > > +   - description: Google Zombie (newest rev) > > +    items: > > +     - const: google,zombie > > +     - const: qcom,sc7280 > > + > > +   - description: Google Zombie with LTE (newest rev) > > +    items: > > +     - const: google,zombie-sku512 > > +     - const: qcom,sc7280 > > + > >    - items: > >      - enum: > >        - xiaomi,lavender > > -- > > 2.17.1 > >
Hi, On Wed, Nov 23, 2022 at 7:07 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > > My checkout steps as below: > > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/ > > qcom/linux.git > > $ git fetch --no-tags linux_qcom > > $ git checkout -b <MyLocalBranchName> linux_qcom/for-next > > > > Is my code base branch still worng? Am I missing something? > > My understanding is that it is best to base you changes on a branch like > 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes > land in one of the '${area}-for-${version}' branches. > > No big issue in this case, just use the corresponding '${area}-for-${version}' > branch for future patches/versions :) FWIW, I usually just use Bjron's for-next branch for stuff like this. While the merge commits in the the Qualcomm "for-next" branch are re-created every time, because of the way "git" works the git hashes of the actual patches are the same as the git hashes of the patches in the separate branches. All the patches in "for-next" should be ones that are fine to base your patches on. -Doug
On Mon, Nov 28, 2022 at 08:20:36AM -0800, Doug Anderson wrote: > Hi, > > On Wed, Nov 23, 2022 at 7:07 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > > My checkout steps as below: > > > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/ > > > qcom/linux.git > > > $ git fetch --no-tags linux_qcom > > > $ git checkout -b <MyLocalBranchName> linux_qcom/for-next > > > > > > Is my code base branch still worng? Am I missing something? > > > > My understanding is that it is best to base you changes on a branch like > > 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes > > land in one of the '${area}-for-${version}' branches. > > > > No big issue in this case, just use the corresponding '${area}-for-${version}' > > branch for future patches/versions :) > > FWIW, I usually just use Bjron's for-next branch for stuff like this. > While the merge commits in the the Qualcomm "for-next" branch are > re-created every time, because of the way "git" works the git hashes > of the actual patches are the same as the git hashes of the patches in > the separate branches. All the patches in "for-next" should be ones > that are fine to base your patches on. I had minor concerns that occasionally tools might get confused it they try to find the parent tree of a patch based on the unstable hash of the merge commit in "for-next". Not sure if it is much of an issue in practice.
Hi, On Mon, Nov 28, 2022 at 9:07 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > On Mon, Nov 28, 2022 at 08:20:36AM -0800, Doug Anderson wrote: > > Hi, > > > > On Wed, Nov 23, 2022 at 7:07 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > > > > My checkout steps as below: > > > > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/ > > > > qcom/linux.git > > > > $ git fetch --no-tags linux_qcom > > > > $ git checkout -b <MyLocalBranchName> linux_qcom/for-next > > > > > > > > Is my code base branch still worng? Am I missing something? > > > > > > My understanding is that it is best to base you changes on a branch like > > > 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes > > > land in one of the '${area}-for-${version}' branches. > > > > > > No big issue in this case, just use the corresponding '${area}-for-${version}' > > > branch for future patches/versions :) > > > > FWIW, I usually just use Bjron's for-next branch for stuff like this. > > While the merge commits in the the Qualcomm "for-next" branch are > > re-created every time, because of the way "git" works the git hashes > > of the actual patches are the same as the git hashes of the patches in > > the separate branches. All the patches in "for-next" should be ones > > that are fine to base your patches on. > > I had minor concerns that occasionally tools might get confused it they > try to find the parent tree of a patch based on the unstable hash of > the merge commit in "for-next". Not sure if it is much of an issue in > practice. It's a fair concern, but I don't _think_ it matters. I think git is smart enough to handle this in nearly all the cases and I think the cases where git can't handle it are cases where (perhaps) the for-next was the correct thing to use anyway. As a test: atop for-next: echo "foo" >> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi git add -u git commit -m "add foo" git format-patch HEAD~ atop arm64-for-6.2: echo "foo" >> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi git add -u git commit -m "add foo arm64" git format-patch HEAD~ If you diff the two patches created, you can see that they both contain "index" line. In my case: index 65601bea0797..b5c9f39737f6 100644 That appears to basically just show a hash of the affected file both before and after your patch. The merge commits and commits to other files don't affect this. Specifically, you can see this before making the change $ git hash-object -w arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi 65601bea07972e75cd1ac880bd43aa3dac62fb76 ...and after making the change: $ git hash-object -w arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b5c9f39737f67e9ba0a115355ecf95df9a04dba7 So tl;dr is that as long as the files you're touching are identical in "for-next" and in a specific branch (like arm64-for-6.2) that the patch files created will actually be exactly the same because all they contain are the object hashes. You could also imagine the files being _not_ exactly the same. If two different branches touched the same file and were merged into "for-next" then it could make a difference. In that case, though, it would still at least be a plausible choice to post it against the "for-next" branch because that should represent the final state. -Doug
diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index c15a729a6852..f617923f7485 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -538,6 +538,16 @@ properties: - const: google,villager-sku512 - const: qcom,sc7280 + - description: Google Zombie (newest rev) + items: + - const: google,zombie + - const: qcom,sc7280 + + - description: Google Zombie with LTE (newest rev) + items: + - const: google,zombie-sku512 + - const: qcom,sc7280 + - items: - enum: - xiaomi,lavender
Add an entry in the device tree binding for sc7280-zombie. Documentation/devicetree/bindings/arm/qcom.yaml Signed-off-by: Owen Yang <ecs.taipeikernel@gmail.com> --- Changes in v2: - Move binding item to Google series bottom. - Modify DT file for zombie. Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+)