lkml.org 
[lkml]   [2013]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v3 00/44] Meta Linux Kernel Port
Hi,

On 11/01/13 13:03, Stephen Rothwell wrote:
> On Fri, 11 Jan 2013 09:15:16 +0000 James Hogan <james.hogan@imgtec.com> wrote:
>>
>> On 10/01/13 23:34, Stephen Rothwell wrote:
>>> You really should not base development work on linux-next and before I
>>> can include it there you will need to rebase it onto Linus' tree (or some
>>> other tree that does not rebase). Its OK to test by doing a merge with
>>> linux-next ...
>>
>> Thanks for the info Stephen. So I suppose if the patchset depended on
>> things in -next the normal way to do it would be to merge in the
>> individual trees I needed first?
>
> Yep, but please let the maintainers of those trees know that you expect
> their tree to not be rebased. Or, if if they aren't really dependencies
> just conflicts, then leave the other tree out and let me and Linus fix
> the conflicts when we merge your tree.
>

Okay, I've rebased the metag tree from linux-next onto the master branch
of Al's signal tree (to get Vineet's GENERIC_SIGALTSTACK fix and
GENERIC_SIGALTSTACK's eventual removal).

git://github.com/jahogan/metag-linux.git
branch: metag-core
tag: metag-core-v3.1

Cheers
James

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-11 16:43    [W:0.141 / U:13.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site