| Message ID | CACPK8Xeet50bqWAY0jG_GRkgvKvFn94XtGDaq1gaVYVkyV_JUQ@mail.gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [GIT,PULL] ARM: bmc: devicetree changes for 5.13, v2 | expand |
On Fri, Apr 16, 2021 at 5:27 AM Joel Stanley <joel@jms.id.au> wrote: > > Hello Soc maintainers, > > Here are some fixes for the changes that have already been merged for v5.13. > > I also merged some changes that came in later. If you would prefer to > not take them then I can send a pull with just the fixes. > > The following changes since commit f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: > > for you to fetch changes up to f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: Hi Joel, something about this pull request doesn't add up, and 'b4' refuses to pull it since the 'since commit f0145db2' and 'up to f0145db2' references refer to the same commit. I assume this is just a copy-paste error on your end, but it would be nice if you could double-check and resend the pull request based on the ee33e2fb3d70 commit that I merged. Arnd
On Mon, 19 Apr 2021 at 14:44, Arnd Bergmann <arnd@arndb.de> wrote: > > On Fri, Apr 16, 2021 at 5:27 AM Joel Stanley <joel@jms.id.au> wrote: > > > > Hello Soc maintainers, > > > > Here are some fixes for the changes that have already been merged for v5.13. > > > > I also merged some changes that came in later. If you would prefer to > > not take them then I can send a pull with just the fixes. > > > > The following changes since commit f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: > > > > for you to fetch changes up to f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: > > Hi Joel, > > something about this pull request doesn't add up, and 'b4' refuses > to pull it since the 'since commit f0145db2' and 'up to f0145db2' > references refer to the same commit. > > I assume this is just a copy-paste error on your end, but it would > be nice if you could double-check and resend the pull request > based on the ee33e2fb3d70 commit that I merged. Nice catch. It looks I've generated pull requests incorrectly from v5.5 onwards, and this is the first time we've noticed. My bash history shows I started generating them like this: git request-pull tag url tag v5.4 was the first time I'd sent a second PR for the same branch, so when it came to generating the next one ctrl+R'd myself into the wrong syntax and continued doing so ever since. I'll try sending this one again now. Cheers, Joel
On Tue, Apr 20, 2021 at 9:11 AM Joel Stanley <joel@jms.id.au> wrote: > > On Mon, 19 Apr 2021 at 14:44, Arnd Bergmann <arnd@arndb.de> wrote: > > > > On Fri, Apr 16, 2021 at 5:27 AM Joel Stanley <joel@jms.id.au> wrote: > > > > > > Hello Soc maintainers, > > > > > > Here are some fixes for the changes that have already been merged for v5.13. > > > > > > I also merged some changes that came in later. If you would prefer to > > > not take them then I can send a pull with just the fixes. > > > > > > The following changes since commit f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: > > > > > > for you to fetch changes up to f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: > > > > Hi Joel, > > > > something about this pull request doesn't add up, and 'b4' refuses > > to pull it since the 'since commit f0145db2' and 'up to f0145db2' > > references refer to the same commit. > > > > I assume this is just a copy-paste error on your end, but it would > > be nice if you could double-check and resend the pull request > > based on the ee33e2fb3d70 commit that I merged. > > Nice catch. It looks I've generated pull requests incorrectly from > v5.5 onwards, and this is the first time we've noticed. My bash > history shows I started generating them like this: > > git request-pull tag url tag Ah right. I'm surprised this resulted in the correct shortlog and diffstat, but that clearly explains it. > I'll try sending this one again now. I only started using b4 recently, so I wouldn't have caught it in the past, as I wasn't paying close attention to the commit hashes. I usually tried to ensure that the contents match up with the description, and that worked fine. I've had sporadic problems in the past with b4 and it's possible that I just papered over it with a manual merge thinking that I did something wrong instead of b4 pointing out an actual problem. Arnd
Hello Soc maintainers, Here are some fixes for the changes that have already been merged for v5.13. I also merged some changes that came in later. If you would prefer to not take them then I can send a pull with just the fixes. The following changes since commit f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: ARM: dts: aspeed: tiogapass: add hotplug controller (2021-04-16 12:28:38 +0930) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git tags/bmc-5.13-devicetree-2 for you to fetch changes up to f0145db24e65f6cf13347a90ffb86e5ef2ff2ca2: ARM: dts: aspeed: tiogapass: add hotplug controller (2021-04-16 12:28:38 +0930) ---------------------------------------------------------------- BMC device tree updates for 5.13, round two - Fixes to the first pull request for Rainier - Small changes for Rainier, EthanolX and Tiogapass ---------------------------------------------------------------- Eddie James (4): ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8 ARM: dts: aspeed: Rainier: Fix humidity sensor bus address ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes ARM: dts: aspeed: Rainier: Update to pass 2 hardware Konstantin Aladyshev (1): ARM: dts: aspeed: amd-ethanolx: Enable all used I2C busses Paul Fertser (1): ARM: dts: aspeed: tiogapass: add hotplug controller