From: bugzilla-daemon@bugzilla.kernel.org
To: dri-devel@lists.freedesktop.org
Subject: [Bug 96351] System hangs up after update to any kernel newer than 3.12*
Date: Sat, 02 May 2015 19:59:29 +0000 [thread overview]
Message-ID: <bug-96351-2300-vY4BUfmuNf@https.bugzilla.kernel.org/> (raw)
In-Reply-To: <bug-96351-2300@https.bugzilla.kernel.org/>
https://bugzilla.kernel.org/show_bug.cgi?id=96351
--- Comment #37 from George Cheban <georgechebanmk@gmail.com> ---
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@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-05-02 19:59 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-08 18:34 [Bug 96351] New: System hangs up after update to any kernel newer than 3.12* bugzilla-daemon
2015-04-08 19:31 ` [Bug 96351] " bugzilla-daemon
2015-04-09 7:54 ` bugzilla-daemon
2015-04-09 8:19 ` bugzilla-daemon
2015-04-09 8:26 ` bugzilla-daemon
2015-04-09 13:08 ` bugzilla-daemon
2015-04-09 13:17 ` bugzilla-daemon
2015-04-09 13:18 ` bugzilla-daemon
2015-04-09 13:18 ` bugzilla-daemon
2015-04-09 13:21 ` bugzilla-daemon
2015-04-09 13:28 ` bugzilla-daemon
2015-04-09 14:30 ` bugzilla-daemon
2015-04-09 14:31 ` bugzilla-daemon
2015-04-09 14:32 ` bugzilla-daemon
2015-04-09 14:34 ` bugzilla-daemon
2015-04-09 15:41 ` bugzilla-daemon
2015-04-20 13:52 ` bugzilla-daemon
2015-04-20 14:31 ` bugzilla-daemon
2015-04-21 2:04 ` bugzilla-daemon
2015-04-29 13:15 ` bugzilla-daemon
2015-04-29 13:17 ` bugzilla-daemon
2015-04-29 13:18 ` bugzilla-daemon
2015-04-29 14:57 ` bugzilla-daemon
2015-04-29 15:01 ` bugzilla-daemon
2015-04-29 15:15 ` bugzilla-daemon
2015-04-29 15:21 ` bugzilla-daemon
2015-04-29 15:30 ` bugzilla-daemon
2015-04-29 15:34 ` bugzilla-daemon
2015-04-29 16:27 ` bugzilla-daemon
2015-04-29 16:31 ` bugzilla-daemon
2015-04-30 2:30 ` bugzilla-daemon
2015-04-30 8:04 ` bugzilla-daemon
2015-04-30 8:05 ` bugzilla-daemon
2015-04-30 8:14 ` bugzilla-daemon
2015-05-01 1:46 ` bugzilla-daemon
2015-05-01 19:08 ` bugzilla-daemon
2015-05-01 22:08 ` bugzilla-daemon
2015-05-02 19:59 ` bugzilla-daemon [this message]
2015-05-02 20:40 ` bugzilla-daemon
2015-05-07 7:15 ` bugzilla-daemon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bug-96351-2300-vY4BUfmuNf@https.bugzilla.kernel.org/ \
--to=bugzilla-daemon@bugzilla.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox