Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/units.h
between commit:
26471d4a6cf8 ("units: Add SI metric prefix definitions")
from the i2c tree and commits:
d874da9a830f ("units: change from 'L' to 'UL'")
390618bdc78a ("units: add the HZ macros")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/units.h
index 4a25e0cc8fb3,8b8dc8a84d93..000000000000
--- a/include/linux/units.h
+++ b/include/linux/units.h
@@@ -4,25 -4,13 +4,29 @@@
#include <linux/math.h>
+/* Metric prefixes in accordance with Système international (d'unités) */
+#define PETA 1000000000000000ULL
+#define TERA 1000000000000ULL
+#define GIGA 1000000000UL
+#define MEGA 1000000UL
+#define KILO 1000UL
+#define HECTO 100UL
+#define DECA 10UL
+#define DECI 10UL
+#define CENTI 100UL
+#define MILLI 1000UL
+#define MICRO 1000000UL
+#define NANO 1000000000UL
+#define PICO 1000000000000ULL
+#define FEMTO 1000000000000000ULL
+
- #define MILLIWATT_PER_WATT 1000L
- #define MICROWATT_PER_MILLIWATT 1000L
- #define MICROWATT_PER_WATT 1000000L
+ #define HZ_PER_KHZ 1000UL
+ #define KHZ_PER_MHZ 1000UL
+ #define HZ_PER_MHZ 1000000UL
+
+ #define MILLIWATT_PER_WATT 1000UL
+ #define MICROWATT_PER_MILLIWATT 1000UL
+ #define MICROWATT_PER_WATT 1000000UL
#define ABSOLUTE_ZERO_MILLICELSIUS -273150
Attachment:
pgpXJGZKCEKdI.pgp
Description: OpenPGP digital signature
