|
On Thu, Jan 13, 2011 at 12:11:12PM +0100, Pablo Neira Ayuso wrote:
> On 13/01/11 02:52, Simon Horman wrote:
> > Hi Pablo,
> >
> > this changest includes the following changes since the v3.2 series
> > which was most recently posted as "[GIT PULL nf-next-2.6] ipvs namespaces".
> >
> > * Remove several hunks that only make whitespace changes
>
> Thanks a lot for doing this.
>
> > * Add Acked-by: Julian Anastasov <ja@xxxxxx>
> > (It was an omission from v3.2)
> > * Fix merge conflicts
> >
> > There are two changes that produce conflicts
> > * In the current net-next-2.6 tree but absent from the current nf-next-2.6
> > tree
> > there is "workqueue: convert
> > cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()"
> > * And in the current nf-next-2.6 tree but absent from the current
> > net-next-2.6 tree there is "net: use the macros defined for the members
> > of flowi"
>
> nf-*-2.6 are Patrick's trees. My trees are here:
>
> http://1984.lsi.us.es/git/
Thanks, noted.
> > In order to create this series I merged net-next-2.6 into nf-next-2.6.
> > The result is at
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6
> > ipvs-netns3.3
> >
> > However, I guess that you have already done your own merge and simply
> > pulling the branch above will create a bit of a mess. Please let me know
> > if you have a tree/branch that I should use as a base for a pull request.
>
> I have pulled it, everything was fine. Thanks Simon!
Great!
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
