https://bugzilla.kernel.org/show_bug.cgi?id=96351 --- Comment #37 from George Cheban <georgechebanmk@xxxxxxxxx> --- Hello, guys! I've made another bisect and the result is 61cf16d8bd38c3dc52033ea75d5b1f8368514a17. I hope, I did it right. But I can't check it on my own because I can't do a "git revert 61cf16d8bd": it always shows me this > git revert 61cf16d8bd > error: could not revert 61cf16d... PCI: Add pci_try_reset_function(), > pci_try_reset_slot(), pci_try_reset_bus() > hint: after resolving the conflicts, mark the corrected paths > hint: with 'git add <paths>' or 'git rm <paths>' > hint: and commit the result with 'git commit' I found that I need to resolve this conflict manually, but I don't know which conflict I need to resolve. Can anyone help me? -- You are receiving this mail because: You are watching the assignee of the bug. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
