* linux-next: clean up time
@ 2012-04-02 1:20 Stephen Rothwell
2012-04-23 6:48 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-04-02 1:20 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: clean up time
2012-04-02 1:20 linux-next: clean up time Stephen Rothwell
@ 2012-04-23 6:48 ` Stephen Rothwell
2012-04-24 22:01 ` Jeremy Fitzhardinge
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-04-23 6:48 UTC (permalink / raw)
To: linux-next
Cc: LKML, Ben Dooks, Jeremy Fitzhardinge, Xen Devel, Sumit Semwal,
Rob Lee
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: clean up time
2012-04-23 6:48 ` Stephen Rothwell
@ 2012-04-24 22:01 ` Jeremy Fitzhardinge
2012-04-25 0:00 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Jeremy Fitzhardinge @ 2012-04-24 22:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Ben Dooks, Xen Devel, Sumit Semwal, Rob Lee
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-cons
Are 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: clean up time
2012-04-24 22:01 ` Jeremy Fitzhardinge
@ 2012-04-25 0:00 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-04-25 0:00 UTC (permalink / raw)
To: Jeremy Fitzhardinge
Cc: linux-next, LKML, Ben Dooks, Xen Devel, Sumit Semwal, Rob Lee
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: clean up time
@ 2013-05-13 1:44 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2013-05-13 1:44 UTC (permalink / raw)
To: LKML; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi all,
Its good to see that many trees have been fast forwarded to v3.10-rc1.
For the others, it would be good to see some clean up (especially those
that now just consist of merge commits and those that contain versions of
patches different to those that were integrated upstream).
So for the "good" trees :-), this just means a fast forward. For the
rest, a rebase (if there was leftovers) or a reset to you upstream.
Thanks for your cooperation. ;-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: clean up time
@ 2019-01-07 3:38 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2019-01-07 3:38 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
Hi all,
Now that v5.0-rc1 is out, it is a good time to clean up your linux-next
included trees with respect to your upstream trees.
Thanks in anticipation. ;-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-01-07 3:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-02 1:20 linux-next: clean up time Stephen Rothwell
2012-04-23 6:48 ` Stephen Rothwell
2012-04-24 22:01 ` Jeremy Fitzhardinge
2012-04-25 0:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-05-13 1:44 Stephen Rothwell
2019-01-07 3:38 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox