From: Olof Johansson <olof@lixom.net>
To: torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, arm@kernel.org,
soc@kernel.org
Subject: [GIT PULL 0/5 v2] ARM: SoC contents for 5.6
Date: Sat, 8 Feb 2020 13:25:28 -0800 [thread overview]
Message-ID: <20200208212533.30744-1-olof@lixom.net> (raw)
In-Reply-To: <20200208112018.29819-1-olof@lixom.net>
Hi Linus,
I completely botched the last generation of pull requests by
mis-generating them, and I also missed to push the tags to the server.
Here's the fresh set. Apologies for the noise, please merge.
For anyone keeping track at home, what happened at my end was:
We use a script to generate our pull requests, and it's ran against a tree
that is mainline + the merged branches. The flow is usually to merge in
a branch, note down any conflicts needing to be resolved, then generate
the pull request. Or, sometimes, I do all the merges and then generate the
last pull request, reset the tree to HEAD~, second-last pull request, etc.
I completely missed changing the tree between the generation this time,
so every pull request referenced the right tag, but the diffstat and
other contents was botched.
It's probably time to automate more of this with scripts at my end,
to avoid these manual mistakes.
-Olof
next prev parent reply other threads:[~2020-02-08 21:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-08 11:20 [GIT PULL 0/5] ARM: Changes for 5.6 merge window Olof Johansson
2020-02-08 11:20 ` [GIT PULL 1/5] ARM: SoC platform updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 11:20 ` [GIT PULL 2/5] ARM: Device-tree updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 11:20 ` [GIT PULL 3/5] ARM: SoC-related driver updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 11:20 ` [GIT PULL 4/5] ARM: SoC defconfig updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 11:20 ` [GIT PULL 5/5] ARM: SoC: late updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 21:25 ` Olof Johansson [this message]
2020-02-08 21:25 ` [GIT PULL 1/5 v2] ARM: SoC platform updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 2/5 v2] ARM: Device-tree updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 3/5 v2] ARM: SoC-related driver updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 4/5 v2] ARM: SoC defconfig updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 5/5 v2] ARM: SoC: late updates Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200208212533.30744-1-olof@lixom.net \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=soc@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®