Re: linux-next: manual merge of the mmc tree with Linus' tree
Hi Ulf, On Fri, 9 May 2014 09:41:39 +0200 Ulf Hansson wrote: > > Within this context; while Chris is being busy, I would be able to > help out better as co-maintainer - if we would add my published mmc > git tree, into your linux-next merge. Could you do that? > > My intent at this point, is to get patches tested in linux-next, but > still get them merged via Chris' mmc tree. Does that make sense? > > Here is my git tree: > git://git.linaro.org/people/ulf.hansson/mmc.git > > I have added a next branch, currently it points to the commit for > "Linux 3.15-rc4", so it holds no patches yet. Added from today. Chris, if this is a problem, give me a heads up. Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window. You will need to ensure that the patches/commits in your tree/series have been: * submitted under GPL v2 (or later) and include the Contributor's Signed-off-by, * posted to the relevant mailing list, * reviewed by you (or another maintainer of your subsystem tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au signature.asc Description: PGP signature
Re: linux-next: manual merge of the mmc tree with Linus' tree
Hi Ulf, On Fri, 9 May 2014 09:41:39 +0200 Ulf Hansson ulf.hans...@linaro.org wrote: Within this context; while Chris is being busy, I would be able to help out better as co-maintainer - if we would add my published mmc git tree, into your linux-next merge. Could you do that? My intent at this point, is to get patches tested in linux-next, but still get them merged via Chris' mmc tree. Does that make sense? Here is my git tree: git://git.linaro.org/people/ulf.hansson/mmc.git I have added a next branch, currently it points to the commit for Linux 3.15-rc4, so it holds no patches yet. Added from today. Chris, if this is a problem, give me a heads up. Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window. You will need to ensure that the patches/commits in your tree/series have been: * submitted under GPL v2 (or later) and include the Contributor's Signed-off-by, * posted to the relevant mailing list, * reviewed by you (or another maintainer of your subsystem tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au signature.asc Description: PGP signature
Re: linux-next: manual merge of the mmc tree with Linus' tree
On 9 May 2014 09:14, Lee Jones wrote:
>> Today's linux-next merge of the mmc tree got a conflict in
>> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
>> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
>> the tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
>> remove smatch warnings") from the mmc tree.
>>
>> I fixed it up (maybe - see below and in the final tree) and can carry
>> the fix as necessary (no action is required).
>
> FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
> will continue to happen until a pending revert is merged.
>
Hi Stehpen,
Within this context; while Chris is being busy, I would be able to
help out better as co-maintainer - if we would add my published mmc
git tree, into your linux-next merge. Could you do that?
My intent at this point, is to get patches tested in linux-next, but
still get them merged via Chris' mmc tree. Does that make sense?
Here is my git tree:
git://git.linaro.org/people/ulf.hansson/mmc.git
I have added a next branch, currently it points to the commit for
"Linux 3.15-rc4", so it holds no patches yet.
Kind regards
Ulf Hansson
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the mmc tree with Linus' tree
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
> the tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
> remove smatch warnings") from the mmc tree.
>
> I fixed it up (maybe - see below and in the final tree) and can carry
> the fix as necessary (no action is required).
FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
will continue to happen until a pending revert is merged.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the mmc tree with Linus' tree
Today's linux-next merge of the mmc tree got a conflict in drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce (mmc: rtsx: Revert mmc: rtsx: add support for pre_req and post_req) from the tree and commit 1f7b581b3ffc (mmc: rtsx: modify error handle and remove smatch warnings) from the mmc tree. I fixed it up (maybe - see below and in the final tree) and can carry the fix as necessary (no action is required). FYI: From what Ulf (co-maintainer of MMC) says, this was expected and will continue to happen until a pending revert is merged. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the mmc tree with Linus' tree
On 9 May 2014 09:14, Lee Jones lee.jo...@linaro.org wrote: Today's linux-next merge of the mmc tree got a conflict in drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce (mmc: rtsx: Revert mmc: rtsx: add support for pre_req and post_req) from the tree and commit 1f7b581b3ffc (mmc: rtsx: modify error handle and remove smatch warnings) from the mmc tree. I fixed it up (maybe - see below and in the final tree) and can carry the fix as necessary (no action is required). FYI: From what Ulf (co-maintainer of MMC) says, this was expected and will continue to happen until a pending revert is merged. Hi Stehpen, Within this context; while Chris is being busy, I would be able to help out better as co-maintainer - if we would add my published mmc git tree, into your linux-next merge. Could you do that? My intent at this point, is to get patches tested in linux-next, but still get them merged via Chris' mmc tree. Does that make sense? Here is my git tree: git://git.linaro.org/people/ulf.hansson/mmc.git I have added a next branch, currently it points to the commit for Linux 3.15-rc4, so it holds no patches yet. Kind regards Ulf Hansson -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the mmc tree with Linus' tree
Hi Chris,
Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
the tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
remove smatch warnings") from the mmc tree.
I fixed it up (maybe - see below and in the final tree) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/mmc/host/rtsx_pci_sdmmc.c
index 0b9ded13a3ae,09340b9429ec..
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@@ -258,10 -375,11 +260,13 @@@ static void sd_send_cmd_get_rsp(struct
if (cmd->opcode == SD_SWITCH_VOLTAGE) {
err = rtsx_pci_write_register(pcr, SD_BUS_STAT,
0xFF, SD_CLK_TOGGLE_EN);
- if (err < 0)
+ if (err < 0) {
+ rtsx_pci_write_register(pcr, SD_BUS_STAT,
+ SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
goto out;
+ }
+
+ clock_toggled = true;
}
rtsx_pci_init_cmd(pcr);
signature.asc
Description: PGP signature
linux-next: manual merge of the mmc tree with Linus' tree
Hi Chris,
Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce (mmc:
rtsx: Revert mmc: rtsx: add support for pre_req and post_req) from
the tree and commit 1f7b581b3ffc (mmc: rtsx: modify error handle and
remove smatch warnings) from the mmc tree.
I fixed it up (maybe - see below and in the final tree) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/mmc/host/rtsx_pci_sdmmc.c
index 0b9ded13a3ae,09340b9429ec..
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@@ -258,10 -375,11 +260,13 @@@ static void sd_send_cmd_get_rsp(struct
if (cmd-opcode == SD_SWITCH_VOLTAGE) {
err = rtsx_pci_write_register(pcr, SD_BUS_STAT,
0xFF, SD_CLK_TOGGLE_EN);
- if (err 0)
+ if (err 0) {
+ rtsx_pci_write_register(pcr, SD_BUS_STAT,
+ SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
goto out;
+ }
+
+ clock_toggled = true;
}
rtsx_pci_init_cmd(pcr);
signature.asc
Description: PGP signature
Re: linux-next: manual merge of the mmc tree with Linus' tree
On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote:
> Hi Chris,
>
> Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
> between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
> Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
> driver for Arasan SDHCI") from the mmc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fix is correct, AFAICT.
Thanks,
Sören
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the mmc tree with Linus' tree
On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote: Hi Chris, Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS between commit c2fd4e380322 (MAINTAINERS: set up proper record for Xilinx Zynq) from Linus' tree and commit 45f210424b4b (mmc: arasan: Add driver for Arasan SDHCI) from the mmc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). The fix is correct, AFAICT. Thanks, Sören -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the mmc tree with Linus' tree
Hi Chris,
Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
driver for Arasan SDHCI") from the mmc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc MAINTAINERS
index 64b39e610589,518bf717b02b..
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1387,9 -1371,7 +1387,10 @@@ T: git git://git.xilinx.com/linux-xlnx.
S:Supported
F:arch/arm/mach-zynq/
F:drivers/cpuidle/cpuidle-zynq.c
+N:zynq
+N:xilinx
+F:drivers/clocksource/cadence_ttc_timer.c
+ F:drivers/mmc/host/sdhci-of-arasan.c
ARM SMMU DRIVER
M:Will Deacon
pgpGV3SFjFD3E.pgp
Description: PGP signature
linux-next: manual merge of the mmc tree with Linus' tree
Hi Chris, Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS between commit c2fd4e380322 (MAINTAINERS: set up proper record for Xilinx Zynq) from Linus' tree and commit 45f210424b4b (mmc: arasan: Add driver for Arasan SDHCI) from the mmc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc MAINTAINERS index 64b39e610589,518bf717b02b.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1387,9 -1371,7 +1387,10 @@@ T: git git://git.xilinx.com/linux-xlnx. S:Supported F:arch/arm/mach-zynq/ F:drivers/cpuidle/cpuidle-zynq.c +N:zynq +N:xilinx +F:drivers/clocksource/cadence_ttc_timer.c + F:drivers/mmc/host/sdhci-of-arasan.c ARM SMMU DRIVER M:Will Deacon will.dea...@arm.com pgpGV3SFjFD3E.pgp Description: PGP signature
