Messages in this thread | | | Date | Fri, 05 Feb 2010 08:55:16 -0800 (PST) | Subject | Re: linux-next: manual merge of the trivial tree with the net tree | From | David Miller <> |
| |
From: Jiri Kosina <jkosina@suse.cz> Date: Fri, 5 Feb 2010 12:23:06 +0100 (CET)
> Ayway, below is the hunk that I have already dropped from my tree (so that > conflict in linux-next is gone), please feel free to apply it to your > tree, and let me known whether you want me to reject all furutre patches
I can't apply it to my tree, that's why we had the conflict in the first place.
Please submit this to me so that it applies cleanly to net-next-2.6
Thanks.
| |