projects / librecmc / librecmc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d649ba) | patch
pistachio: make patches apply again
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 20 Jan 2018 22:36:05 +0000 (23:36 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 20 Jan 2018 22:36:05 +0000 (23:36 +0100)
commit36f1978a701cc76b2cd2e4c73ce5f2d5d68c4c51
tree686e16caabf5e0497a6f78a31e1598b8e55c85d9tree | snapshot
parent4d649ba949752f8e2fe4a4ff0c79ae3ab3124f48commit | diff
pistachio: make patches apply again

Support for Winbond NAND flash detection was added into the generic
patches and this conflicted with this patch adding Gigadevice support.

Fixes: 02050f7e7d5b ("kernel/4.{4, 9}: add manufacturer ID for Winbond NANDs")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch diff | blob | history