Turn off BATTERY_MAX1721X as I don't think it is needed and it brings in regmap-w1

22 files changed, 24 insertions, 21 deletions

diff --git a/baseconfig/CONFIG_BATTERY_MAX1721X b/baseconfig/CONFIG_BATTERY_MAX1721X
index 0f2a78a9b..98c04567c 100644
--- a/baseconfig/CONFIG_BATTERY_MAX1721X
+++ b/baseconfig/CONFIG_BATTERY_MAX1721X
@@ -1 +1 @@
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 69327ce34..7436ce885 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -472,7 +472,7 @@ CONFIG_BATTERY_AXP20X=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 69ddd0309..91f442dd8 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -472,7 +472,7 @@ CONFIG_BATTERY_AXP20X=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index f76e02ec8..845d0e117 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -514,7 +514,7 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_RX51=m
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_TWL4030_MADC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index cf5dd219b..5370c2c02 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -492,7 +492,7 @@ CONFIG_BATTERY_AXP20X=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_SBS=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6593c07c5..20b5f3c13 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -491,7 +491,7 @@ CONFIG_BATTERY_AXP20X=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_SBS=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 29ff65b8c..0f84603ba 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -513,7 +513,7 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_RX51=m
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_TWL4030_MADC=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 392fd9f2f..61c981a38 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -390,7 +390,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_OLPC=y
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 4b5e4f37d..478b71876 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -391,7 +391,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_OLPC=y
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 9d7808e34..a4ba15679 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -391,7 +391,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_OLPC=y
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 4a3bcfa3c..d64e69a92 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -390,7 +390,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_OLPC=y
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 2ed9e936a..bde4ad3f9 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -339,7 +339,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 87631d0a8..58ef69ed8 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -338,7 +338,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 9d32a0b6e..a951d28e2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -332,7 +332,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 5f1d889a7..c6c7d5398 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -331,7 +331,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 37e9e2b46..255e400ca 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -332,7 +332,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index bee9d15be..151b35339 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -331,7 +331,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a53549703..62ef09ef6 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -334,7 +334,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index b216e689e..c94ce63b6 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -333,7 +333,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2383f778c..cc47f89b4 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -398,7 +398,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5790b9f29..a9d78afc2 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -397,7 +397,7 @@ CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
-CONFIG_BATTERY_MAX1721X=m
+# CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
diff --git a/rebase-notes.txt b/rebase-notes.txt
index 6ddbe14e5..52d1be955 100644
--- a/rebase-notes.txt
+++ b/rebase-notes.txt
@@ -1,3 +1,6 @@
+Linux 4.14 rebase notes:
+- Turn on i686 PAE
+
 Linux 4.10 rebase notes:
 - F25 and earlier, revert S390x minumum hw level