Linus Torvalds wrote:
Ok, I ended up re-doing the merge by hand (ie I fetched all the other
parts, ignored your top entry, and just merged the previous one manually).
I'm pushing out the result now, can you verify that the r8192.c file looks
like you expected it to look? I think it should be the same thing you
ended up with except for fixed parents, but...
Looks good here, thanks.
I re-did the merge locally, as a test, finalizing with 'git commit'
rather than 'git-commit-tree ...' and the parent info came out correct.
FWIW.
Jeff
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
