| Message ID | 20140824184035.GA13254@localhost |
|---|---|
| State | New |
| Headers | show |
On Sun, Aug 24, 2014 at 11:40 AM, Olof Johansson <olof@lixom.net> wrote: > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes Grr. Yes and no. You didn't really mean for me to pull that branch, you meant for me to pull your tag "fixes-for-linus". Where did this fail? Do you still run an old broken git version that guesses at what the pull target is, and makes sh*t up? Please update if so. And if not, how did the tag contents get added to the pull request despite the pull request not mentioning the tag? Linus
On Sun, Aug 24, 2014 at 3:58 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > On Sun, Aug 24, 2014 at 11:40 AM, Olof Johansson <olof@lixom.net> wrote: >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes > > Grr. Yes and no. > > You didn't really mean for me to pull that branch, you meant for me to > pull your tag "fixes-for-linus". Yes, of course -- and I missed that. > Where did this fail? Do you still run an old broken git version that > guesses at what the pull target is, and makes sh*t up? Please update > if so. > > And if not, how did the tag contents get added to the pull request > despite the pull request not mentioning the tag? TL;DR: My fault, I'll double-check this in the future. Long version: 100% operator error due to the tools changing. I'm still used to looking for the warning that it doesn't find/use the remote tag as a safety for these mistakes. I'm still used to the older version that figured out tag name on its own, so I did my usual: * run request-pull to double-check what's in the branch * create the tag * push the tag * rerun request-pull with the tag, redirect to file ...and then finally send the email with the file contents. What I forgot to do was change the command line between the first and the second run -- the first one referenced the branch, the second should have referenced the tag but I just reused the same command from history. The old version of git that auto-guessed branch/tag name used to warn if it used a tag to create the pull request, but didn't find the tag in the remote repo. I suppose it'd be useful if the current version warned if the third argument wasn't referring to the same tag as well, it would definitely have saved me here. -Olof
Hi Linus, The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9: Linux 3.17-rc1 (2014-08-16 10:40:26 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes for you to fetch changes up to bf87bb12bd7062bf577163f3f6d765debbae6200: bus: arm-ccn: Fix warning message (2014-08-24 11:28:30 -0700) ---------------------------------------------------------------- ARM: SoC fixes for 3.17-rc A collection of fixes from this week, it's been pretty quiet and nothing really stands out as particularly noteworthy here -- mostly minor fixes across the field: - ODROID booting was fixed due to PMIC interrupts missing in DT - A collection of i.MX fixes - Minor Tegra fix for regulators - Rockchip fix and addition of SoC-specific mailing list to make it easier to find posted patches. ---------------------------------------------------------------- Anson Huang (1): ARM: imx: correct gpu2d_axi and gpu3d_axi clock setting Arnd Bergmann (1): ARM: imx6: fix SMP compilation again Bill Pringlemeir (1): ARM: dts: vf610-twr: Fix pinctrl_esdhc1 pin definitions. Chen-Yu Tsai (1): ARM: dt: sun6i: Add #address-cells and #size-cells to i2c controller nodes Daniel Drake (2): ARM: dts: Enable PMIC interrupts on ODROID ARM: dts: ODROID i2c improvements Fugang Duan (1): ARM: dts: imx6sx: fix the pad setting for uart CTS_B Geert Uytterhoeven (1): ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux Heiko Stuebner (2): ARM: dts: rockchip: readd missing mmc0 pinctrl settings MAINTAINERS: add new Rockchip SoC list Lothar Waßmann (1): ARM: dts: i.MX53: fix apparent bug in VPU clks Marcel Ziswiler (1): ARM: tegra: apalis/colibri t30: fix on-module 5v0 supplies Olof Johansson (3): Merge tag 'imx-fixes-3.17' of git://git.kernel.org/.../shawnguo/linux into fixes Merge tag 'sunxi-dt-for-3.17-2' of git://git.kernel.org/.../mripard/linux into fixes Merge tag 'v3.17-rockchip-fixes1' of git://git.kernel.org/.../mmind/linux-rockchip into fixes Pawel Moll (1): bus: arm-ccn: Fix warning message Shawn Guo (2): ARM: imx: fix TLB missing of IOMUXC base address during suspend ARM: imx: remove unnecessary ARCH_HAS_OPP select Silvio Fricke (1): ARM: dts: imx6: edmqmx6: change enet reset pin MAINTAINERS | 1 + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 13 ++++++++++++ arch/arm/boot/dts/imx53.dtsi | 2 +- arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 3 ++- arch/arm/boot/dts/imx6sx-pinfunc.h | 26 +++++++++++------------ arch/arm/boot/dts/r8a7791-koelsch.dts | 7 ------ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 ++ arch/arm/boot/dts/rk3188-radxarock.dts | 2 ++ arch/arm/boot/dts/sun6i-a31.dtsi | 8 +++++++ arch/arm/boot/dts/tegra30-apalis.dtsi | 11 +++++++++- arch/arm/boot/dts/tegra30-colibri.dtsi | 11 +++++++++- arch/arm/boot/dts/vf610-twr.dts | 2 +- arch/arm/mach-imx/Kconfig | 2 -- arch/arm/mach-imx/Makefile | 2 ++ arch/arm/mach-imx/clk-imx6q.c | 10 +++++++-- arch/arm/mach-imx/suspend-imx6.S | 2 ++ drivers/bus/arm-ccn.c | 2 +- 17 files changed, 76 insertions(+), 30 deletions(-)