sean.wang@xxxxxxxxxx <sean.wang@xxxxxxxxxx> wrote: [...] > .../net/wireless/mediatek/mt76/Makefile.orig | 42 + > drivers/net/wireless/mediatek/mt76/dma.c.orig | 994 +++++ > .../wireless/mediatek/mt76/mac80211.c.orig | 1793 +++++++++ > drivers/net/wireless/mediatek/mt76/mt76.h | 1 + > .../net/wireless/mediatek/mt76/mt76.h.orig | 1876 +++++++++ > .../mediatek/mt76/mt76_connac_mac.c.orig | 1196 ++++++ > .../wireless/mediatek/mt76/mt76_connac_mcu.c | 4 +- > .../mediatek/mt76/mt76_connac_mcu.c.orig | 3200 +++++++++++++++ > .../wireless/mediatek/mt76/mt7921/dma.c.orig | 314 ++ > .../wireless/mediatek/mt76/mt7921/init.c.orig | 326 ++ > .../wireless/mediatek/mt76/mt7921/mac.c.orig | 1121 ++++++ > .../wireless/mediatek/mt76/mt7921/main.c.orig | 1838 +++++++++ > .../wireless/mediatek/mt76/mt7921/mcu.c.orig | 1357 +++++++ > .../mediatek/mt76/mt7921/mt7921.h.orig | 561 +++ > .../wireless/mediatek/mt76/mt7921/pci.c.orig | 497 +++ > .../mediatek/mt76/mt7921/pci_mac.c.orig | 348 ++ > .../wireless/mediatek/mt76/mt7921/sdio.c.orig | 322 ++ > .../mediatek/mt76/mt7921/sdio_mac.c.orig | 142 + > .../net/wireless/mediatek/mt76/mt7925/main.c | 14 +- > .../wireless/mediatek/mt76/mt7925/main.c.orig | 2209 +++++++++++ > .../wireless/mediatek/mt76/mt7925/mcu.c.orig | 3506 +++++++++++++++++ > .../wireless/mediatek/mt76/mt7925/mcu.c.rej | 35 + > 22 files changed, 21690 insertions(+), 6 deletions(-) > create mode 100644 drivers/net/wireless/mediatek/mt76/Makefile.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/dma.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mac80211.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt76.h.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/dma.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/init.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/mac.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/main.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/mcu.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/pci.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/sdio.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/main.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c.orig > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c.rej Obviously add wrong conflict files.