Messages in this thread | | | Date | Thu, 10 Dec 2009 14:41:02 -0800 (PST) | Subject | Re: linux-next: manual merge of the trivial tree with the net-current tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 10 Dec 2009 22:14:06 +1100
> Hi Jiri, > > On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote: >> >> Linus has merged trivial tree into his tree tonight, so I am afraid that >> davem will have to fix the conflict when pulling Linus tree into >> net-current. > > Yep, or Linus can fix it if he feels inclined.
Nah, I'll do a pull into net-2.6 to resolve the conflict first.
| |