Merge branch 'mlimonci/use-am' into 'main'

Use `git am` instead of `b4 shazam`

See merge request kernel-firmware/linux-firmware!40
This commit is contained in:
Josh Boyer 2023-10-24 11:20:25 +00:00
commit 4ee0175651

View File

@ -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