[lkml]   [2013]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the tip tree with the kbuild tree
That is the right fix indeed.

Stephen Rothwell <> wrote:

>Hi all,
>Today's linux-next merge of the tip tree got a conflict in
>kernel/ between commit 70730bca1331 ("kernel: Replace
> with a bc script") from the kbuild tree and commit
>63a3f603413f (" Eliminate Perl warning") from the tip
>I just droppped the tip tree version (I deleted the file) and can carry
>the fix as necessary (no action is required).

Sent from my mobile phone. Please excuse brevity and lack of formatting.

 \ /
  Last update: 2013-02-18 08:43    [W:0.081 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site