Messages in this thread |  | | | Date | Mon, 11 Jun 2012 15:29:58 -0700 | | Subject | Re: [PATCH V2 3/3] staging: zram: conventions, line splitting | | From | Sam Hansen <> |
| |
> Problem is, other zram changes just went into my tree, so they probably > conflicted with your changes as well.
Ok cool. I was assuming me and someone else simply clobbered each others work. I try and keep an eye on the mailing lists to avoid duplicating work and causing a merge conflict. Thanks for the feedback, it's appreciated!
-sam
|  |