| Message ID | 20151023180711.GA11749@lukather |
|---|---|
| State | New |
| Headers | show |
On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > Allwinner DT changes for 4.4, round 3 > > A bunch of new boards, but mostly enable the support for the Audio Codec > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > boards. > > Pulled into next/dt, thanks! Arnd
On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > > Allwinner DT changes for 4.4, round 3 > > > > A bunch of new boards, but mostly enable the support for the Audio Codec > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > > boards. > > > > > > Pulled into next/dt, thanks! And dropped again: In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory Please make sure branches you send actually work by themselves. Arnd
On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > > > Allwinner DT changes for 4.4, round 3 > > > > > > A bunch of new boards, but mostly enable the support for the Audio Codec > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > > > boards. > > > > > > > > > > Pulled into next/dt, thanks! > > And dropped again: > > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory > > Please make sure branches you send actually work by themselves. Damn, you're right... Sorry about that... You need to pull the tag sunxi-clk-for-4.4 that has been merged in the clk tree in 38ce30e29dc. Mike, Stephen, will that tag be stable? Arnd, do you want me to merge it in my DT branch, or do you want to merge it yourself? Thanks, and sorry again, Maxime
On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > > > Allwinner DT changes for 4.4, round 3 > > > > > > A bunch of new boards, but mostly enable the support for the Audio Codec > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > > > boards. > > > > > > > > > > Pulled into next/dt, thanks! > > And dropped again: > > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory I'm starting to find these header files somewhat tedious to deal with, and I wish we could do it better. We're creating a lot of cross-tree dependencies with these, usually jsut for one or two added lines in one of these headers. For those cases, I wonder if we should just take the DT change without using the symbol for the first release, and then next release a cleanup patch that moves over to include the header file and use that flag from there. But I'm all ears looking for better suggestions too. I wish to move away from the current model where we usually have to merge in a clk or pinctrl branch to get this though. -Olof
On Sun, Oct 25, 2015 at 09:13:08PM +0100, Maxime Ripard wrote: > On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: > > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > > > > Allwinner DT changes for 4.4, round 3 > > > > > > > > A bunch of new boards, but mostly enable the support for the Audio Codec > > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > > > > boards. > > > > > > > > > > > > > > Pulled into next/dt, thanks! > > > > And dropped again: > > > > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: > > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory > > > > Please make sure branches you send actually work by themselves. > > Damn, you're right... Sorry about that... > > You need to pull the tag sunxi-clk-for-4.4 that has been merged in the > clk tree in 38ce30e29dc. > > Mike, Stephen, will that tag be stable? I don't see that tag in your tree, Maxime? I also don't see 38ce30e29dc in the clk tree on kernel.org. I'm a little confused right now... -Olof
Hi Olof, On Mon, Oct 26, 2015 at 9:07 AM, Olof Johansson <olof@lixom.net> wrote: > On Sun, Oct 25, 2015 at 09:13:08PM +0100, Maxime Ripard wrote: >> On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: >> > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: >> > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: >> > > > Allwinner DT changes for 4.4, round 3 >> > > > >> > > > A bunch of new boards, but mostly enable the support for the Audio Codec >> > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various >> > > > boards. >> > > > >> > > > >> > > >> > > Pulled into next/dt, thanks! >> > >> > And dropped again: >> > >> > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: >> > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory >> > >> > Please make sure branches you send actually work by themselves. >> >> Damn, you're right... Sorry about that... >> >> You need to pull the tag sunxi-clk-for-4.4 that has been merged in the >> clk tree in 38ce30e29dc. >> >> Mike, Stephen, will that tag be stable? > > I don't see that tag in your tree, Maxime? I also don't see 38ce30e29dc in > the clk tree on kernel.org. > > I'm a little confused right now... The tag is "sunxi-clocks-for-4.4": https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/tag/?h=sunxi-clocks-for-4.4 The merge commit in the clk tree is 938ce30e29dc: https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=938ce30e29dc Regards ChenYu
On Mon, Oct 26, 2015 at 09:46:24AM +0800, Chen-Yu Tsai wrote: > Hi Olof, > > On Mon, Oct 26, 2015 at 9:07 AM, Olof Johansson <olof@lixom.net> wrote: > > On Sun, Oct 25, 2015 at 09:13:08PM +0100, Maxime Ripard wrote: > >> On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: > >> > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > >> > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > >> > > > Allwinner DT changes for 4.4, round 3 > >> > > > > >> > > > A bunch of new boards, but mostly enable the support for the Audio Codec > >> > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > >> > > > boards. > >> > > > > >> > > > > >> > > > >> > > Pulled into next/dt, thanks! > >> > > >> > And dropped again: > >> > > >> > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: > >> > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory > >> > > >> > Please make sure branches you send actually work by themselves. > >> > >> Damn, you're right... Sorry about that... > >> > >> You need to pull the tag sunxi-clk-for-4.4 that has been merged in the > >> clk tree in 38ce30e29dc. > >> > >> Mike, Stephen, will that tag be stable? > > > > I don't see that tag in your tree, Maxime? I also don't see 38ce30e29dc in > > the clk tree on kernel.org. > > > > I'm a little confused right now... > > The tag is "sunxi-clocks-for-4.4": > https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/tag/?h=sunxi-clocks-for-4.4 > > The merge commit in the clk tree is 938ce30e29dc: > https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=938ce30e29dc Thanks, so both the tag and the hash were missing a few characters. :-) I've merged this in now. Note that this has resulted in a tree that won't misect cleanly, since having the clk contents merged instead of used as a base for the dt branch means that you could end up in a bisect state that has the DT branch but not the clk branch. These are some of the reasons why I'm not overly excited about these header file dependencies. :( -Olof
Quoting Maxime Ripard (2015-10-25 13:13:08) > On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: > > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > > > > Allwinner DT changes for 4.4, round 3 > > > > > > > > A bunch of new boards, but mostly enable the support for the Audio Codec > > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > > > > boards. > > > > > > > > > > > > > > Pulled into next/dt, thanks! > > > > And dropped again: > > > > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: > > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory > > > > Please make sure branches you send actually work by themselves. > > Damn, you're right... Sorry about that... > > You need to pull the tag sunxi-clk-for-4.4 that has been merged in the > clk tree in 38ce30e29dc. > > Mike, Stephen, will that tag be stable? Yes. Regards, Mike > > Arnd, do you want me to merge it in my DT branch, or do you want to > merge it yourself? > > Thanks, and sorry again, > Maxime > > -- > Maxime Ripard, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com
On Mon, Oct 26, 2015 at 02:48:28PM +0900, Olof Johansson wrote: > On Mon, Oct 26, 2015 at 09:46:24AM +0800, Chen-Yu Tsai wrote: > > Hi Olof, > > > > On Mon, Oct 26, 2015 at 9:07 AM, Olof Johansson <olof@lixom.net> wrote: > > > On Sun, Oct 25, 2015 at 09:13:08PM +0100, Maxime Ripard wrote: > > >> On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: > > >> > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > > >> > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > > >> > > > Allwinner DT changes for 4.4, round 3 > > >> > > > > > >> > > > A bunch of new boards, but mostly enable the support for the Audio Codec > > >> > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > > >> > > > boards. > > >> > > > > > >> > > > > > >> > > > > >> > > Pulled into next/dt, thanks! > > >> > > > >> > And dropped again: > > >> > > > >> > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: > > >> > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory > > >> > > > >> > Please make sure branches you send actually work by themselves. > > >> > > >> Damn, you're right... Sorry about that... > > >> > > >> You need to pull the tag sunxi-clk-for-4.4 that has been merged in the > > >> clk tree in 38ce30e29dc. > > >> > > >> Mike, Stephen, will that tag be stable? > > > > > > I don't see that tag in your tree, Maxime? I also don't see 38ce30e29dc in > > > the clk tree on kernel.org. > > > > > > I'm a little confused right now... > > > > The tag is "sunxi-clocks-for-4.4": > > https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/tag/?h=sunxi-clocks-for-4.4 > > > > The merge commit in the clk tree is 938ce30e29dc: > > https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=938ce30e29dc > > Thanks, so both the tag and the hash were missing a few characters. :-) Gaah, sorry... > I've merged this in now. Note that this has resulted in a tree that won't > misect cleanly, since having the clk contents merged instead of used as a base > for the dt branch means that you could end up in a bisect state that has the DT > branch but not the clk branch. Even if it has been merged before the DT patches have been applied? That's not really what I'd expect from bisect :/ > These are some of the reasons why I'm not overly excited about these > header file dependencies. :( Yeah, I see why now. Your suggestion of using the raw values first and then switch to using the headers make sense I guess, we'll try to stick to that in the future. Thanks! Maxime
On Mon, Oct 26, 2015 at 3:34 AM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Mon, Oct 26, 2015 at 02:48:28PM +0900, Olof Johansson wrote: >> On Mon, Oct 26, 2015 at 09:46:24AM +0800, Chen-Yu Tsai wrote: >> > Hi Olof, >> > >> > On Mon, Oct 26, 2015 at 9:07 AM, Olof Johansson <olof@lixom.net> wrote: >> > > On Sun, Oct 25, 2015 at 09:13:08PM +0100, Maxime Ripard wrote: >> > >> On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: >> > >> > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: >> > >> > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: >> > >> > > > Allwinner DT changes for 4.4, round 3 >> > >> > > > >> > >> > > > A bunch of new boards, but mostly enable the support for the Audio Codec >> > >> > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various >> > >> > > > boards. >> > >> > > > >> > >> > > > >> > >> > > >> > >> > > Pulled into next/dt, thanks! >> > >> > >> > >> > And dropped again: >> > >> > >> > >> > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: >> > >> > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory >> > >> > >> > >> > Please make sure branches you send actually work by themselves. >> > >> >> > >> Damn, you're right... Sorry about that... >> > >> >> > >> You need to pull the tag sunxi-clk-for-4.4 that has been merged in the >> > >> clk tree in 38ce30e29dc. >> > >> >> > >> Mike, Stephen, will that tag be stable? >> > > >> > > I don't see that tag in your tree, Maxime? I also don't see 38ce30e29dc in >> > > the clk tree on kernel.org. >> > > >> > > I'm a little confused right now... >> > >> > The tag is "sunxi-clocks-for-4.4": >> > https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/tag/?h=sunxi-clocks-for-4.4 >> > >> > The merge commit in the clk tree is 938ce30e29dc: >> > https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=938ce30e29dc >> >> Thanks, so both the tag and the hash were missing a few characters. :-) > > Gaah, sorry... > >> I've merged this in now. Note that this has resulted in a tree that won't >> misect cleanly, since having the clk contents merged instead of used as a base >> for the dt branch means that you could end up in a bisect state that has the DT >> branch but not the clk branch. > > Even if it has been merged before the DT patches have been applied? > That's not really what I'd expect from bisect :/ Yeah, due to the way bisect works, the only way to guarantee bisectability is if you base the DT branch on top of the clk branch when you build it. Otherwise the bisect can come down the path of only having the DT contents not the clk contents. >> These are some of the reasons why I'm not overly excited about these >> header file dependencies. :( > > Yeah, I see why now. Your suggestion of using the raw values first and > then switch to using the headers make sense I guess, we'll try to > stick to that in the future. See how it works for you. If it's awkward to do that we can try something else. I'd love to see some of these dependencies go away though. -Olof
On 10/31, Olof Johansson wrote: > On Mon, Oct 26, 2015 at 3:34 AM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > On Mon, Oct 26, 2015 at 02:48:28PM +0900, Olof Johansson wrote: > >> On Mon, Oct 26, 2015 at 09:46:24AM +0800, Chen-Yu Tsai wrote: > >> > Hi Olof, > >> > > >> > On Mon, Oct 26, 2015 at 9:07 AM, Olof Johansson <olof@lixom.net> wrote: > >> > > On Sun, Oct 25, 2015 at 09:13:08PM +0100, Maxime Ripard wrote: > >> > >> On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: > >> > >> > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: > >> > >> > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: > >> > >> > > > Allwinner DT changes for 4.4, round 3 > >> > >> > > > > >> > >> > > > A bunch of new boards, but mostly enable the support for the Audio Codec > >> > >> > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various > >> > >> > > > boards. > >> > >> > > > > >> > >> > > > > >> > >> > > > >> > >> > > Pulled into next/dt, thanks! > >> > >> > > >> > >> > And dropped again: > >> > >> > > >> > >> > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: > >> > >> > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory > >> > >> > > >> > >> > Please make sure branches you send actually work by themselves. > >> > >> > >> > >> Damn, you're right... Sorry about that... > >> > >> > >> > >> You need to pull the tag sunxi-clk-for-4.4 that has been merged in the > >> > >> clk tree in 38ce30e29dc. > >> > >> > >> > >> Mike, Stephen, will that tag be stable? > >> > > > >> > > I don't see that tag in your tree, Maxime? I also don't see 38ce30e29dc in > >> > > the clk tree on kernel.org. > >> > > > >> > > I'm a little confused right now... > >> > > >> > The tag is "sunxi-clocks-for-4.4": > >> > https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/tag/?h=sunxi-clocks-for-4.4 > >> > > >> > The merge commit in the clk tree is 938ce30e29dc: > >> > https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=938ce30e29dc > >> > >> Thanks, so both the tag and the hash were missing a few characters. :-) > > > > Gaah, sorry... > > > >> I've merged this in now. Note that this has resulted in a tree that won't > >> misect cleanly, since having the clk contents merged instead of used as a base > >> for the dt branch means that you could end up in a bisect state that has the DT > >> branch but not the clk branch. > > > > Even if it has been merged before the DT patches have been applied? > > That's not really what I'd expect from bisect :/ > > Yeah, due to the way bisect works, the only way to guarantee > bisectability is if you base the DT branch on top of the clk branch > when you build it. Otherwise the bisect can come down the path of only > having the DT contents not the clk contents. Why can't the dts changes be applied directly on top of the branch that's in the clk tree and then sent off to arm-soc? The git merge && git commit technique also works, but it introduces an unnecessary merge commit into the history.
On Mon, Nov 2, 2015 at 11:19 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: > On 10/31, Olof Johansson wrote: >> On Mon, Oct 26, 2015 at 3:34 AM, Maxime Ripard >> <maxime.ripard@free-electrons.com> wrote: >> > On Mon, Oct 26, 2015 at 02:48:28PM +0900, Olof Johansson wrote: >> >> On Mon, Oct 26, 2015 at 09:46:24AM +0800, Chen-Yu Tsai wrote: >> >> > Hi Olof, >> >> > >> >> > On Mon, Oct 26, 2015 at 9:07 AM, Olof Johansson <olof@lixom.net> wrote: >> >> > > On Sun, Oct 25, 2015 at 09:13:08PM +0100, Maxime Ripard wrote: >> >> > >> On Fri, Oct 23, 2015 at 10:55:13PM +0200, Arnd Bergmann wrote: >> >> > >> > On Friday 23 October 2015 22:41:04 Arnd Bergmann wrote: >> >> > >> > > On Friday 23 October 2015 20:07:11 Maxime Ripard wrote: >> >> > >> > > > Allwinner DT changes for 4.4, round 3 >> >> > >> > > > >> >> > >> > > > A bunch of new boards, but mostly enable the support for the Audio Codec >> >> > >> > > > on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various >> >> > >> > > > boards. >> >> > >> > > > >> >> > >> > > > >> >> > >> > > >> >> > >> > > Pulled into next/dt, thanks! >> >> > >> > >> >> > >> > And dropped again: >> >> > >> > >> >> > >> > In file included from /git/arm-soc/arch/arm/boot/dts/sun4i-a10-a1000.dts:46:0: >> >> > >> > /git/arm-soc/arch/arm/boot/dts/sun4i-a10.dtsi:48:46: fatal error: dt-bindings/clock/sun4i-a10-pll2.h: No such file or directory >> >> > >> > >> >> > >> > Please make sure branches you send actually work by themselves. >> >> > >> >> >> > >> Damn, you're right... Sorry about that... >> >> > >> >> >> > >> You need to pull the tag sunxi-clk-for-4.4 that has been merged in the >> >> > >> clk tree in 38ce30e29dc. >> >> > >> >> >> > >> Mike, Stephen, will that tag be stable? >> >> > > >> >> > > I don't see that tag in your tree, Maxime? I also don't see 38ce30e29dc in >> >> > > the clk tree on kernel.org. >> >> > > >> >> > > I'm a little confused right now... >> >> > >> >> > The tag is "sunxi-clocks-for-4.4": >> >> > https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/tag/?h=sunxi-clocks-for-4.4 >> >> > >> >> > The merge commit in the clk tree is 938ce30e29dc: >> >> > https://git.kernel.org/cgit/linux/kernel/git/clk/linux.git/commit/?h=clk-next&id=938ce30e29dc >> >> >> >> Thanks, so both the tag and the hash were missing a few characters. :-) >> > >> > Gaah, sorry... >> > >> >> I've merged this in now. Note that this has resulted in a tree that won't >> >> misect cleanly, since having the clk contents merged instead of used as a base >> >> for the dt branch means that you could end up in a bisect state that has the DT >> >> branch but not the clk branch. >> > >> > Even if it has been merged before the DT patches have been applied? >> > That's not really what I'd expect from bisect :/ >> >> Yeah, due to the way bisect works, the only way to guarantee >> bisectability is if you base the DT branch on top of the clk branch >> when you build it. Otherwise the bisect can come down the path of only >> having the DT contents not the clk contents. > > Why can't the dts changes be applied directly on top of the > branch that's in the clk tree and then sent off to arm-soc? The > git merge && git commit technique also works, but it introduces > an unnecessary merge commit into the history. "base the DT branch on top of the clk branch" is exactly that, isn't it? -Olof
On 11/02, Olof Johansson wrote: > On Mon, Nov 2, 2015 at 11:19 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: > > On 10/31, Olof Johansson wrote: > >> On Mon, Oct 26, 2015 at 3:34 AM, Maxime Ripard > >> > > >> > Gaah, sorry... > >> > > >> >> I've merged this in now. Note that this has resulted in a tree that won't > >> >> misect cleanly, since having the clk contents merged instead of used as a base > >> >> for the dt branch means that you could end up in a bisect state that has the DT > >> >> branch but not the clk branch. > >> > > >> > Even if it has been merged before the DT patches have been applied? > >> > That's not really what I'd expect from bisect :/ > >> > >> Yeah, due to the way bisect works, the only way to guarantee > >> bisectability is if you base the DT branch on top of the clk branch > >> when you build it. Otherwise the bisect can come down the path of only > >> having the DT contents not the clk contents. > > > > Why can't the dts changes be applied directly on top of the > > branch that's in the clk tree and then sent off to arm-soc? The > > git merge && git commit technique also works, but it introduces > > an unnecessary merge commit into the history. > > "base the DT branch on top of the clk branch" is exactly that, isn't it? > Yes. I mostly wanted to point out that you don't need to do the git merge part when building that branch.
On Mon, Nov 02, 2015 at 11:19:23AM -0800, Stephen Boyd wrote: > > >> I've merged this in now. Note that this has resulted in a tree that won't > > >> misect cleanly, since having the clk contents merged instead of used as a base > > >> for the dt branch means that you could end up in a bisect state that has the DT > > >> branch but not the clk branch. > > > > > > Even if it has been merged before the DT patches have been applied? > > > That's not really what I'd expect from bisect :/ > > > > Yeah, due to the way bisect works, the only way to guarantee > > bisectability is if you base the DT branch on top of the clk branch > > when you build it. Otherwise the bisect can come down the path of only > > having the DT contents not the clk contents. > > Why can't the dts changes be applied directly on top of the > branch that's in the clk tree and then sent off to arm-soc? The > git merge && git commit technique also works, but it introduces > an unnecessary merge commit into the history. Wouldn't that mean that you have to rebase your whole DT branch whenever a single patch introduces a dependency on some clock patch? Maxime
On 11/08, Maxime Ripard wrote: > On Mon, Nov 02, 2015 at 11:19:23AM -0800, Stephen Boyd wrote: > > > >> I've merged this in now. Note that this has resulted in a tree that won't > > > >> misect cleanly, since having the clk contents merged instead of used as a base > > > >> for the dt branch means that you could end up in a bisect state that has the DT > > > >> branch but not the clk branch. > > > > > > > > Even if it has been merged before the DT patches have been applied? > > > > That's not really what I'd expect from bisect :/ > > > > > > Yeah, due to the way bisect works, the only way to guarantee > > > bisectability is if you base the DT branch on top of the clk branch > > > when you build it. Otherwise the bisect can come down the path of only > > > having the DT contents not the clk contents. > > > > Why can't the dts changes be applied directly on top of the > > branch that's in the clk tree and then sent off to arm-soc? The > > git merge && git commit technique also works, but it introduces > > an unnecessary merge commit into the history. > > Wouldn't that mean that you have to rebase your whole DT branch > whenever a single patch introduces a dependency on some clock patch? > That depends on whether or not the single patch depends on the other patches in the "DT" branch. If it did, then do the merge and apply the single patch on top. But if doesn't, maybe it's something like new SoC support that needs a binding header, I would make a second DT branch that points at the branch in the clk tree and then apply the dt patch directly on top. Of course, this is just one way to do it. I'm mostly trying to avoid unnecessary merges, but sometimes merges are unavoidable. The most important thing is to maintain bisectability and to make it clear why merges from other trees are done by putting some sort of reason in the commit text of the merge.
Hi Arnd, Kevin, Olof, Please pull the following (late and last) pull request for the 4.4 merge window. Thanks! Maxime The following changes since commit c2aa565107fb539a84494fe8dac5fd5eb5678123: ARM: dts: sun6i: Add a dts file for the Sinovoip BPI-M2 board (2015-10-17 18:24:11 +0200) are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/sunxi-dt-for-4.4-3 for you to fetch changes up to a5ea06d0bc123cc7f49d042fab60ddd3964764c8: ARM: dts: sun6i: Add dts file for MSI Primo81 tablet (2015-10-23 08:05:17 +0200) ---------------------------------------------------------------- Allwinner DT changes for 4.4, round 3 A bunch of new boards, but mostly enable the support for the Audio Codec on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various boards. ---------------------------------------------------------------- Adam Sampson (1): ARM: dts: sun7i: Enable USB DRC on pcDuino v3 Nano Aleksei Mamlin (1): ARM: dts: sun4i: Enable audio codec on Marsboard A10. Chen-Yu Tsai (3): ARM: dts: sun6i: Add support for Sinlinx A31s SDK board ARM: sun4i: Enable cubieboard audio codec ARM: dts: sun6i: Add simplefb node labels to reference at board level Emilio López (2): ARM: sun7i: Add sunxi codec device node ARM: sun7i: dt: enable audio codec on Cubietruck Hans de Goede (1): ARM: dts: sun4i: Add dts file for the pov protab2-ips9 tablet Karsten Merker (1): ARM: dts: sun6i: Add dts file for MSI Primo81 tablet Marcus Cooper (2): ARM: sun4i: Add sunxi codec device node ARM: sun4i: Enable audio-codec on Mele A1000 Maxime Ripard (9): ARM: sun4i: Add audio PLL ARM: sun5i: Add audio PLL ARM: sun7i: Add audio PLL ARM: sun4i: Add audio codec clock ARM: sun5i: Add audio codec clock ARM: sun7i: Add audio codec clock ARM: sun5i: Add the Audio codec DT node ARM: sun7i: Enable cubieboard2 audio codec ARM: sun5i: chip: Enable the audio codec arch/arm/boot/dts/Makefile | 5 +- arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 4 + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 199 ++++++++++++++++++ arch/arm/boot/dts/sun4i-a10.dtsi | 31 +++ arch/arm/boot/dts/sun5i-r8-chip.dts | 4 + arch/arm/boot/dts/sun5i.dtsi | 31 +++ arch/arm/boot/dts/sun6i-a31.dtsi | 4 +- arch/arm/boot/dts/sun6i-a31s-primo81.dts | 255 +++++++++++++++++++++++ arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 140 +++++++++++++ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 153 ++++++++++++++ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 4 + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 19 ++ arch/arm/boot/dts/sun7i-a20.dtsi | 31 +++ 16 files changed, 889 insertions(+), 3 deletions(-) create mode 100644 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s.dts