diff options
| author | Linus Torvalds | 2016-05-24 04:05:11 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-24 04:05:11 +0200 |
| commit | d6542d76ec88dde3305b06c03952d87b15bbc292 (patch) | |
| tree | 4510f1b1bef283f22e168bbfd5933983c991fe78 /arch/tile/configs | |
| parent | Merge branch 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... (diff) | |
| parent | Fix typo (diff) | |
| download | kernel-qcow2-linux-d6542d76ec88dde3305b06c03952d87b15bbc292.tar.gz kernel-qcow2-linux-d6542d76ec88dde3305b06c03952d87b15bbc292.tar.xz kernel-qcow2-linux-d6542d76ec88dde3305b06c03952d87b15bbc292.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile updates from Chris Metcalf:
"This is an even quieter cycle than usual"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
Fix typo
Fix typo
Fix typo
tile: sort the "select" lines in the TILE/TILEGX configs
tile: clarify barrier semantics of atomic_add_return
tile/defconfigs: Remove CONFIG_IPV6_PRIVACY
Diffstat (limited to 'arch/tile/configs')
| -rw-r--r-- | arch/tile/configs/tilegx_defconfig | 1 | ||||
| -rw-r--r-- | arch/tile/configs/tilepro_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig index 718905557f7e..dea47c31ab16 100644 --- a/arch/tile/configs/tilegx_defconfig +++ b/arch/tile/configs/tilegx_defconfig @@ -89,7 +89,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig index dc85468afd5e..95743eedf747 100644 --- a/arch/tile/configs/tilepro_defconfig +++ b/arch/tile/configs/tilepro_defconfig @@ -85,7 +85,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y |