lkml.org 
[lkml]   [2011]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the scsi-post-merge tree with the akpm tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/alpha/kernel/osf_sys.c between commit 2df7a7d1cd07 ("alpha: unbreak
osf_setsysinfo(SSI_NVPAIRS, [SSIN_UACPROC, UAC_SIGBUS])") from the tree
and commit db52f8af5ea5 ("The bug was accidentally found by the following
program:") from the akpm tree.

The former appears to be a later version of the latter, so I have dropped
the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-08-29 07:21    [from the cache]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and my Meterkast|Read the blog