Hi all, On Mon, 2 Apr 2012 11:20:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:> > Can people please clean up stuff in their trees that has been merged by > their upstream. This is especially useful where the upstream merged (or > applied) a slightly different version of their tree.There is still much cruft in the linux-next included trees ... The following trees appear empty (relative to Linus'' tree) but cause conflicts: bjdooks-i2c xen dma-buf cpuidle-cons -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
On 04/22/2012 11:48 PM, Stephen Rothwell wrote:> Hi all, > > On Mon, 2 Apr 2012 11:20:09 +1000 Stephen Rothwell<sfr@canb.auug.org.au> wrote:>> >> Can people please clean up stuff in their trees that has been merged by >> their upstream. This is especially useful where the upstream merged (or >> applied) a slightly different version of their tree. > > There is still much cruft in the linux-next included trees ... The > following trees appear empty (relative to Linus'' tree) but cause conflicts: > > bjdooks-i2c > xen > dma-buf > cpuidle-consAre you pulling from xen.git upstream/xen? I just updated it to be current Linus master, so it shouldn''t conflict any more. Thanks, J
Hi Jeremy, On Tue, 24 Apr 2012 15:01:46 -0700 Jeremy Fitzhardinge <jeremy@goop.org> wrote:> > Are you pulling from xen.git upstream/xen? I just updated it to be > current Linus master, so it shouldn''t conflict any more.Yes, I fetch branch upstream/xen from git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git and, yes, it is empty now, thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au