| Message ID | 1399912877-29595-1-git-send-email-santosh.shilimkar@ti.com |
|---|---|
| State | New |
| Headers | show |
On Mon, May 12, 2014 at 12:41:17PM -0400, Santosh Shilimkar wrote: > Hi Arm-soc folks, > > Please pull below keystone SOC updates for 3.16. It merges cleanly with > arm-soc 'next/soc' head. As already discussed, the $subject pull request > has a depedency with DT dma-properties pull request [1] I sent last week > to be pulled into arm-soc. Hi, I didn't see a reply from Russell on that pull request yet, so I haven't brought it in as a dependency in case he has comments and it needs to be respun. If this branch is dependent on that code, then you really need to base it on top of it, or else you will break bisectability. Essentially you might end up in a state with bisect where only these patches are applied and not the dependent ones. -Olof
On Tuesday 20 May 2014 01:15 AM, Olof Johansson wrote: > On Mon, May 12, 2014 at 12:41:17PM -0400, Santosh Shilimkar wrote: >> Hi Arm-soc folks, >> >> Please pull below keystone SOC updates for 3.16. It merges cleanly with >> arm-soc 'next/soc' head. As already discussed, the $subject pull request >> has a depedency with DT dma-properties pull request [1] I sent last week >> to be pulled into arm-soc. > > Hi, > > I didn't see a reply from Russell on that pull request yet, so I haven't > brought it in as a dependency in case he has comments and it needs to be > respun. > I pinged RMK to pull the series. After that you can pull the dependent pull request as well as subject series. Just for wider testing purpose, I have included the dma series in my next branch and it sitting in linux-next for more than 2 weeks now. > If this branch is dependent on that code, then you really need to base it on > top of it, or else you will break bisectability. Essentially you might end up > in a state with bisect where only these patches are applied and not the > dependent ones. > I thought about that. The git objects as they exist now in pull request will ensure that the $subject series patches appears after the dependent series. I wanted to avoid SOC stuff to be mixed with the dma series. Regards, Santosh
Olof, On Tuesday 20 May 2014 09:40 AM, Santosh Shilimkar wrote: > On Tuesday 20 May 2014 01:15 AM, Olof Johansson wrote: >> On Mon, May 12, 2014 at 12:41:17PM -0400, Santosh Shilimkar wrote: >>> Hi Arm-soc folks, >>> >>> Please pull below keystone SOC updates for 3.16. It merges cleanly with >>> arm-soc 'next/soc' head. As already discussed, the $subject pull request >>> has a depedency with DT dma-properties pull request [1] I sent last week >>> to be pulled into arm-soc. >> >> Hi, >> >> I didn't see a reply from Russell on that pull request yet, so I haven't >> brought it in as a dependency in case he has comments and it needs to be >> respun. >> > I pinged RMK to pull the series. After that you can pull the dependent > pull request as well as subject series. Just for wider testing purpose, > I have included the dma series in my next branch and it sitting in > linux-next for more than 2 weeks now. > >> If this branch is dependent on that code, then you really need to base it on >> top of it, or else you will break bisectability. Essentially you might end up >> in a state with bisect where only these patches are applied and not the >> dependent ones. >> > I thought about that. The git objects as they exist now in pull request will > ensure that the $subject series patches appears after the dependent series. > I wanted to avoid SOC stuff to be mixed with the dma series. > I see RMK has merged [1] 'dt-dma-properties-for-arm' in his 'devel-stable' and 'for-next' branch (Thanks Russell). Can you please pull[1] and $subject into arm-soc tree now ? Thanks !! Regards, Santosh [1] https://lkml.org/lkml/2014/5/7/368
Hi Arm-soc folks, Please pull below keystone SOC updates for 3.16. It merges cleanly with arm-soc 'next/soc' head. As already discussed, the $subject pull request has a depedency with DT dma-properties pull request [1] I sent last week to be pulled into arm-soc. The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5: Linux 3.15-rc1 (2014-04-13 14:18:35 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-soc for you to fetch changes up to 14f3791439b5a6cf12127fb80204265533d92664: ARM: keystone: Update the dma offset for non-dt platform devices (2014-05-08 15:43:33 -0400) ---------------------------------------------------------------- Keystone SOC updates for 3.16 - Drop unused COMMON_CLK_DEBUG option - Enable MTD_SPI_NOR config needed for M25P80 - Enable coherent higher address memory space ---------------------------------------------------------------- Brian Norris (1): ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80) Lad Prabhakar (1): ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG Santosh Shilimkar (2): ARM: keystone: Switch over to coherent memory address space ARM: keystone: Update the dma offset for non-dt platform devices arch/arm/configs/integrator_defconfig | 1 - arch/arm/configs/keystone_defconfig | 2 +- arch/arm/configs/sunxi_defconfig | 1 - arch/arm/configs/vt8500_v6_v7_defconfig | 1 - arch/arm/mach-keystone/keystone.c | 74 +++++++++++++++++++++++++++++++ arch/arm/mach-keystone/memory.h | 24 ++++++++++ arch/arm/mach-keystone/platsmp.c | 18 +++++++- 7 files changed, 116 insertions(+), 5 deletions(-) create mode 100644 arch/arm/mach-keystone/memory.h Regards, Santosh [1] https://lkml.org/lkml/2014/5/7/368