Messages in this thread |  | | Date | Mon, 29 Aug 2011 15:19:09 +1000 | | From | Stephen Rothwell <> | | Subject | linux-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] |  |