The following changes since commit b5a3d8bc9146ba22a25116cb748c97341bf99737:

  Merge tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu into staging (2022-01-03 09:34:41 -0800)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/sdmmc-20220104

for you to fetch changes up to d666c7b529c503381a714b97d2e174848b5aad8d:

  hw/sd: Add SDHC support for SD card SPI-mode (2022-01-04 08:50:27 +0100)

----------------------------------------------------------------
SD/MMC patches queue

- Add SDHC support for SD card SPI-mode (Frank Chang)

----------------------------------------------------------------

Frank Chang (1):
  hw/sd: Add SDHC support for SD card SPI-mode

Philippe Mathieu-Daudé (1):
  hw/sd/sdcard: Rename Write Protect Group variables

 hw/sd/sd.c | 48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

-- 
2.33.1

On 1/3/22 11:54 PM, Philippe Mathieu-Daudé wrote:
> The following changes since commit b5a3d8bc9146ba22a25116cb748c97341bf99737:
> 
>    Merge tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu into staging (2022-01-03 09:34:41 -0800)
> 
> are available in the Git repository at:
> 
>    https://github.com/philmd/qemu.git tags/sdmmc-20220104
> 
> for you to fetch changes up to d666c7b529c503381a714b97d2e174848b5aad8d:
> 
>    hw/sd: Add SDHC support for SD card SPI-mode (2022-01-04 08:50:27 +0100)
> 
> ----------------------------------------------------------------
> SD/MMC patches queue
> 
> - Add SDHC support for SD card SPI-mode (Frank Chang)
> 
> ----------------------------------------------------------------
> 
> Frank Chang (1):
>    hw/sd: Add SDHC support for SD card SPI-mode
> 
> Philippe Mathieu-Daudé (1):
>    hw/sd/sdcard: Rename Write Protect Group variables
> 
>   hw/sd/sd.c | 48 +++++++++++++++++++++++++++++-------------------
>   1 file changed, 29 insertions(+), 19 deletions(-)
> 

Lots of failures of the form

../hw/sd/sd.c:842:33: error: 'SDState' {aka 'struct SDState'} has no member named 
'wp_groups'; did you mean 'wp_group_bits'?
   842 |         if (test_bit(wpnum, sd->wp_groups)) {
       |                                 ^~~~~~~~~
       |                                 wp_group_bits


r~

On 4/1/22 19:42, Richard Henderson wrote:
> On 1/3/22 11:54 PM, Philippe Mathieu-Daudé wrote:
>> The following changes since commit 
>> b5a3d8bc9146ba22a25116cb748c97341bf99737:
>>
>>    Merge tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu 
>> into staging (2022-01-03 09:34:41 -0800)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/philmd/qemu.git tags/sdmmc-20220104
>>
>> for you to fetch changes up to d666c7b529c503381a714b97d2e174848b5aad8d:
>>
>>    hw/sd: Add SDHC support for SD card SPI-mode (2022-01-04 08:50:27 
>> +0100)
>>
>> ----------------------------------------------------------------
>> SD/MMC patches queue
>>
>> - Add SDHC support for SD card SPI-mode (Frank Chang)
>>
>> ----------------------------------------------------------------
>>
>> Frank Chang (1):
>>    hw/sd: Add SDHC support for SD card SPI-mode
>>
>> Philippe Mathieu-Daudé (1):
>>    hw/sd/sdcard: Rename Write Protect Group variables
>>
>>   hw/sd/sd.c | 48 +++++++++++++++++++++++++++++-------------------
>>   1 file changed, 29 insertions(+), 19 deletions(-)
>>
> 
> Lots of failures of the form
> 
> ../hw/sd/sd.c:842:33: error: 'SDState' {aka 'struct SDState'} has no 
> member named 'wp_groups'; did you mean 'wp_group_bits'?
>    842 |         if (test_bit(wpnum, sd->wp_groups)) {
>        |                                 ^~~~~~~~~
>        |                                 wp_group_bits
> 

I am really sorry for having wasted your time this way... I was in the
middle of migrating my workstation and posted the non-rebased branch :(

I'll take extra care this doesn't happen again.

Regards,

Phil.