diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2023-10-24 11:20:25 +0000 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2023-10-24 11:20:25 +0000 |
| commit | 4ee017565113f5326661886dd7b7786359c77a5e (patch) | |
| tree | cefe4bae4be2df719125d4a391c60434a66fbc21 | |
| parent | 5f560c1e0d357114cdeaab91e5ff0a9fb8be6221 (diff) | |
| parent | 39d553923355fdb0890a02ab8434c8bef4e1da36 (diff) | |
| download | linux-firmware-4ee017565113f5326661886dd7b7786359c77a5e.tar.gz | |
Merge branch 'mlimonci/use-am' into 'main'
Use `git am` instead of `b4 shazam`
See merge request kernel-firmware/linux-firmware!40
| -rwxr-xr-x | contrib/process_linux_firmware.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/process_linux_firmware.py b/contrib/process_linux_firmware.py index ab005ee7..663f4ca7 100755 --- a/contrib/process_linux_firmware.py +++ b/contrib/process_linux_firmware.py @@ -172,7 +172,7 @@ def process_patch(mbox, num, remote): quiet_cmd(cmd) # apply the patch - cmd = ["b4", "shazam", "-m", "-"] + cmd = ["git", "am"] logging.debug("Running {}".format(cmd)) p = subprocess.Popen( cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE |