| Message ID | 1449244720-19253-1-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 12/04/2015 08:58 AM, Simon Glass wrote: > These were added by mistake in commit fde7e189. They cause a warning when > configuring the boards. Remove them. Patches 1-3, Tested-by: Stephen Warren <swarren@nvidia.com> It would be useful to include the appropriate Fixes: tags in the commit message, and this issue was originally: Reported-by: Kevin Hilman <khilman@linaro.org>
Hi Stephen, On 4 December 2015 at 10:16, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 12/04/2015 08:58 AM, Simon Glass wrote: >> >> These were added by mistake in commit fde7e189. They cause a warning when >> configuring the boards. Remove them. > > > Patches 1-3, > Tested-by: Stephen Warren <swarren@nvidia.com> > > It would be useful to include the appropriate Fixes: tags in the commit > message, and this issue was originally: > > Reported-by: Kevin Hilman <khilman@linaro.org> Thanks - what Fixes tags? Regards, Simon
On 12/04/2015 10:25 AM, Simon Glass wrote: > Hi Stephen, > > On 4 December 2015 at 10:16, Stephen Warren <swarren@wwwdotorg.org> wrote: >> On 12/04/2015 08:58 AM, Simon Glass wrote: >>> >>> These were added by mistake in commit fde7e189. They cause a warning when >>> configuring the boards. Remove them. >> >> >> Patches 1-3, >> Tested-by: Stephen Warren <swarren@nvidia.com> >> >> It would be useful to include the appropriate Fixes: tags in the commit >> message, and this issue was originally: >> >> Reported-by: Kevin Hilman <khilman@linaro.org> > > Thanks - what Fixes tags? I'd expect the following at the start of the "signature paragraph": Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig") Referencing in a standard way the commits that caused the bug that this patch fixes makes researching bug/commit history easier. Admittedly that tag is something from the Linux kernel development process and isn't mandated by U-Boot's process, but I think it's a good idea that's worth following.
On 2015年12月04日 23:58, Simon Glass wrote: > These were added by mistake in commit fde7e189. They cause a warning when > configuring the boards. Remove them. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Reported-by: Stephen Warren <swarren@nvidia.com> > --- > > configs/beaver_defconfig | 3 --- > configs/cardhu_defconfig | 3 --- > configs/jetson-tk1_defconfig | 3 --- > configs/trimslice_defconfig | 3 --- > 4 files changed, 12 deletions(-) > Acked-by: Thomas Chou <thomas@wytron.com.tw>
On Fri, Dec 04, 2015 at 08:58:37AM -0700, Simon Glass wrote: > These were added by mistake in commit fde7e189. They cause a warning when > configuring the boards. Remove them. > > Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig") > Signed-off-by: Simon Glass <sjg@chromium.org> > Reported-by: Stephen Warren <swarren@nvidia.com> > Tested-by: Stephen Warren <swarren@nvidia.com> > Reported-by: Kevin Hilman <khilman@linaro.org> > Acked-by: Thomas Chou <thomas@wytron.com.tw> Applied to u-boot/master, thanks!
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 2930344..8add08d 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SLINK=y CONFIG_USB=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 5760018..c9f565a 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SLINK=y CONFIG_USB=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 9500d2c..efc4aee 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA114_SPI=y CONFIG_USB=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index ee40218..e34faa3 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SFLASH=y CONFIG_USB=y
These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them. Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: Stephen Warren <swarren@nvidia.com> --- configs/beaver_defconfig | 3 --- configs/cardhu_defconfig | 3 --- configs/jetson-tk1_defconfig | 3 --- configs/trimslice_defconfig | 3 --- 4 files changed, 12 deletions(-)