On Thu, Dec 10, 2009 at 12:21:00PM +0100, Jiri Kosina wrote: > On Wed, 9 Dec 2009, Greg KH wrote: > > > > > > I just used the tty tree version where they clashed. Jiri, you might > > > > > consider sending that patch to Greg for the tty tree. > > > > > > > > the trivial tree pull request has already been sent to Linus a day ago. I > > > > am now waiting whether it will be merged or missed. > > > > > > > > In the latter case, I will split the tty hunk out and send to Greg. In the > > > > former case the conflict would have to be solved either by Greg or Linus. > > > > > > OK, that's fine, thanks. > > > > Sounds good to me as well. > > Linus has merged my tree, so either you or Linus will have to fix the > conflict. Thanks, I'll fix it up in my tree. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
