[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20131205125601.5ecf1b2b6c0f3df14f6097fa@canb.auug.org.au>
Date: Thu, 5 Dec 2013 12:56:01 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>,
Rusty Russell <rusty@...tcorp.com.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Felipe Contreras <felipe.contreras@...il.com>
Subject: linux-next: manual merge of the akpm-current tree with the modules
tree
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
kernel/params.c between commit 88a88b320a90 ("params: improve standard
definitions") from the modules tree and commit b23eb499ed40
("kernel-paramsc-improve-standard-definitions-checkpatch-fixes") from the
akpm-current tree.
I fixed it up (using the akpm tree patch that just fixed the whitespace)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists