linux-next: recent rebases

linux-next: recent rebases

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 962 bytes --]

Hi Linus,

I am not sure how much you care about this, but here is a list of the
trees in linux-next that have been rebased in the last day (i.e. since I
fetched the trees for next-20121211):

fsnotify: rebased to v3.6(!) to resolve a conflict.
	git://git.infradead.org/users/eparis/notify.git#for-next
f2fs: rebased to v3.7
	git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
dma-mapping: rebased to v3.7 (you already merged this)
	git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next
drop-experimental: rebased to commit caf491916b1c (this tree rebased many
	times since it was added to linux-next - mostly with no change to the
	patches involved - maybe it has had Acks added or something).
	git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#linux-next

At least these trees have been rebased in linux-next as well.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: recent rebases

[Eric Paris]

On Wed, 2012-12-12 at 08:41 +1100, Stephen Rothwell wrote:
> Hi Linus,
> 
> I am not sure how much you care about this, but here is a list of the
> trees in linux-next that have been rebased in the last day (i.e. since I
> fetched the trees for next-20121211):
> 
> fsnotify: rebased to v3.6(!) to resolve a conflict.
> 	git://git.infradead.org/users/eparis/notify.git#for-next

I planned to let it sit in -next until at least next thursday before I
sent a pull request.  Thought that fit within the rules...

Re: linux-next: recent rebases

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

Hi Eric,

On Tue, 11 Dec 2012 16:58:43 -0500 Eric Paris <eparis@redhat.com> wrote:
>
> On Wed, 2012-12-12 at 08:41 +1100, Stephen Rothwell wrote:
> > 
> > fsnotify: rebased to v3.6(!) to resolve a conflict.
> > 	git://git.infradead.org/users/eparis/notify.git#for-next
> 
> I planned to let it sit in -next until at least next thursday before I
> sent a pull request.  Thought that fit within the rules...

No worries, just noting.  Though you could have just done a merge against
v3.6 with an explanation in the merge changelog of why it was done.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]