* linux-next: manual merge of the staging tree with the usb tree
From: Stephen Rothwell @ 2012-04-24 4:48 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
("Staging: line6: only allocate a buffer if it is needed") (and later)
from the staging tree.
The latter supercedes the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: New ARM build coverage
From: Viresh Kumar @ 2012-04-24 3:28 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stefan Roese, Paul Gortmaker, linux-next@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
In-Reply-To: <201204201737.58922.arnd@arndb.de>
On 4/20/2012 11:07 PM, Arnd Bergmann wrote:
>>From d06bce2084e946c3ae4dc3011032d0c23b7cd815 Mon Sep 17 00:00:00 2001
> From: Arnd Bergmann <arnd@arndb.de>
> Date: Fri, 20 Apr 2012 19:33:55 +0200
> Subject: [PATCH] ARM: spear6xx: remove board selection options
>
> There are no board specific configurations that need user
> intervention, so just make MACH_SPEAR600 the silent default
> for ARCH_SPEAR6XX to prevent users from turning it off, which
> would result in a build error.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig
> index fbe298b..339f397 100644
> --- a/arch/arm/mach-spear6xx/Kconfig
> +++ b/arch/arm/mach-spear6xx/Kconfig
> @@ -2,21 +2,9 @@
> # SPEAr6XX Machine configuration file
> #
>
> -if ARCH_SPEAR6XX
> -
> -menu "SPEAr6xx Implementations"
> -config BOARD_SPEAR600_DT
> - bool "SPEAr600 generic board configured via device-tree"
> - select MACH_SPEAR600
> +config MACH_SPEAR600
> + def_bool y
> + depends on ARCH_SPEAR6XX
> select USE_OF
> help
> Supports ST SPEAr600 boards configured via the device-tree
> -
> -endmenu
> -
> -config MACH_SPEAR600
> - bool "SPEAr600"
> - help
> - Supports ST SPEAr600 Machine
> -
> -endif #ARCH_SPEAR6XX
Acked-by: Viresh Kumar <viresh.kumar@st.com>
--
viresh
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-24 2:48 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Emmanuel Grumbach, Wey-Yi Guy,
David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-testmode.c between commit d33e152e1edd
("iwlwifi: Stop using NLA_PUT*()") from the net-next tree and commit
2152268ff911 ("iwlwifi: op_mode holds its pointer to the config") from
the wireless-next tree.
I was hoping that we were done with these ... :-(
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
index bb27509,a6b16aa..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@@ -543,12 -539,11 +543,12 @@@ static int iwl_testmode_driver(struct i
IWL_ERR(priv, "Memory allocation fail\n");
return -ENOMEM;
}
- NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
- IWL_TM_CMD_DEV2APP_EEPROM_RSP);
- NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
- priv->cfg->base_params->eeprom_size,
- priv->eeprom);
+ if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+ IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
+ nla_put(skb, IWL_TM_ATTR_EEPROM,
- cfg(priv)->base_params->eeprom_size,
++ priv->cfg->base_params->eeprom_size,
+ priv->eeprom))
+ goto nla_put_failure;
status = cfg80211_testmode_reply(skb);
if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n",
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] net ax25: Fix the build when sysctl support is disabled.
From: David Miller @ 2012-04-24 2:15 UTC (permalink / raw)
To: rdunlap; +Cc: ebiederm, sfr, linux-next, linux-kernel, netdev, linux-hams, ralf
In-Reply-To: <4F9601CD.2070000@xenotime.net>
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 23 Apr 2012 18:28:45 -0700
> On 04/23/2012 05:25 PM, Eric W. Biederman wrote:
>
>>
>> Randy Dunlap <rdunlap@xenotime.net> reported:
>>
>>> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>>>
>>>> Hi all,
>>>>
>>>> Changes since 20120420:
>>>
>>>
>>> include/net/ax25.h:447:75: error: expected ';' before '}' token
>>>
>>> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
>>> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>>>
>>> First function: move ';' inside braces.
>>> Second function: drop the ';'.
>>
>> Put the semicolons where it makes sense.
>>
>> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
>
>
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Applied, thanks guys.
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the infiniband tree
From: Stephen Rothwell @ 2012-04-24 2:06 UTC (permalink / raw)
To: David Miller, netdev-u79uwXL29TY76Z2rM5mHXA
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Roland Dreier,
linux-rdma-u79uwXL29TY76Z2rM5mHXA, Parav Pandit, Ajit Khaparde
[-- Attachment #1: Type: text/plain, Size: 1974 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/emulex/benet/be.h between commit c72adfd767af
("be2net: Add functionality to support RoCE driver") from the infiniband
tree and commit 42f11cf20cc5 ("be2net: fix ethtool get settings") from
the net-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
diff --cc drivers/net/ethernet/emulex/benet/be.h
index 7bb2e97,ad69cf8..0000000
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@@ -379,22 -394,7 +396,18 @@@ struct be_adapter
u32 rx_fc; /* Rx flow control */
u32 tx_fc; /* Tx flow control */
bool stats_cmd_sent;
- int link_speed;
- u8 port_type;
- u8 transceiver;
- u8 autoneg;
u8 generation; /* BladeEngine ASIC generation */
+ u32 if_type;
+ struct {
+ u8 __iomem *base; /* Door Bell */
+ u32 size;
+ u32 total_size;
+ u64 io_addr;
+ } roce_db;
+ u32 num_msix_roce_vec;
+ struct ocrdma_dev *ocrdma_dev;
+ struct list_head entry;
+
u32 flash_status;
struct completion flash_compl;
@@@ -606,17 -597,5 +620,18 @@@ extern void be_link_status_update(struc
extern void be_parse_stats(struct be_adapter *adapter);
extern int be_load_fw(struct be_adapter *adapter, u8 *func);
extern bool be_is_wol_supported(struct be_adapter *adapter);
+ extern bool be_pause_supported(struct be_adapter *adapter);
+
+/*
+ * internal function to initialize-cleanup roce device.
+ */
+extern void be_roce_dev_add(struct be_adapter *);
+extern void be_roce_dev_remove(struct be_adapter *);
+
+/*
+ * internal function to open-close roce device during ifup-ifdown.
+ */
+extern void be_roce_dev_open(struct be_adapter *);
+extern void be_roce_dev_close(struct be_adapter *);
+
#endif /* BE_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] net ax25: Fix the build when sysctl support is disabled.
From: Randy Dunlap @ 2012-04-24 1:28 UTC (permalink / raw)
To: Eric W. Biederman
Cc: David Miller, Stephen Rothwell, linux-next, LKML, netdev,
linux-hams, Ralf Baechle
In-Reply-To: <m1obqirn5e.fsf_-_@fess.ebiederm.org>
On 04/23/2012 05:25 PM, Eric W. Biederman wrote:
>
> Randy Dunlap <rdunlap@xenotime.net> reported:
>
>> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20120420:
>>
>>
>> include/net/ax25.h:447:75: error: expected ';' before '}' token
>>
>> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
>> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>>
>> First function: move ';' inside braces.
>> Second function: drop the ';'.
>
> Put the semicolons where it makes sense.
>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
>
> Resent to include David Miller.
>
> include/net/ax25.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/ax25.h b/include/net/ax25.h
> index 8a7a122..5d23521 100644
> --- a/include/net/ax25.h
> +++ b/include/net/ax25.h
> @@ -444,8 +444,8 @@ extern void ax25_uid_free(void);
> extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
> extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
> #else
> -static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> -static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
> +static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
> +static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
> #endif /* CONFIG_SYSCTL */
>
> #endif
--
~Randy
^ permalink raw reply
* linux-next: build warning in Linus' tree
From: Stephen Rothwell @ 2012-04-24 1:20 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Ted,
Using Linus' tree, today's linux-next build (powerpc ppc64_defconfig)
produced this warning:
fs/ext4/super.c: In function 'parse_options':
fs/ext4/super.c:1600:23: warning: unused variable 'sbi' [-Wunused-variable]
Introduced by commit 26092bf52478 ("ext4: use a table-driven handler for
mount options"). This build has CONFIG_QUOTA not set.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Apr 19 (zcache)
From: Konrad Rzeszutek Wilk @ 2012-04-24 1:06 UTC (permalink / raw)
To: Seth Jennings
Cc: Dan Magenheimer, Nitin Gupta, linux-next, LKML, Randy Dunlap,
Stephen Rothwell
In-Reply-To: <4F91B3C1.5080507@linux.vnet.ibm.com>
On Fri, Apr 20, 2012 at 02:06:41PM -0500, Seth Jennings wrote:
> On 04/20/2012 11:37 AM, Konrad Rzeszutek Wilk wrote:
> > On Thu, Apr 19, 2012 at 11:36:26PM -0500, Seth Jennings wrote:
> >> One fix is this:
> >>
> >> diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
> >> index 3ed2c8f..7048e01 100644
> >> --- a/drivers/staging/zcache/Kconfig
> >> +++ b/drivers/staging/zcache/Kconfig
> >> @@ -2,7 +2,7 @@ config ZCACHE
> >> bool "Dynamic compression of swap pages and clean pagecache pages"
> >> # X86 dependency is because zsmalloc uses non-portable pte/tlb
> >> # functions
> >> - depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
> >> + depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
> >> select ZSMALLOC
> >> select CRYPTO_LZO
> >> default n
> >>
> >> I think this is the best way since ZCACHE is a bool and CRYPTO is the only
> >> one of the dependencies that is a tristate. This forces both ZSMALLOC and
> >> CRYPTO_LZO to be builtin if ZCACHE is selected.
> >>
> >> Any other suggestions?
> >
> > Could you do:
> >
> > default y if (CRYPTO=y || ZSMALLOC=m)
> > default m if (CRYPTO=m || ZSMALLOC=y)
>
> ZCACHE is a bool and can't be built as a module.
Duh!
>
> The requirement is the if ZCACHE=y, then ZSMALLOC and
> CRYPTO must also =y.
OK, your patch makes sense then. Can you repost it please with
Greg KH on it so he can add it in the staging tree?
^ permalink raw reply
* [PATCH] net ax25: Fix the build when sysctl support is disabled.
From: Eric W. Biederman @ 2012-04-24 0:23 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, netdev, linux-hams,
Ralf Baechle
In-Reply-To: <4F95828A.8050403@xenotime.net>
Randy Dunlap <rdunlap@xenotime.net> reported:
> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120420:
>
>
> include/net/ax25.h:447:75: error: expected ';' before '}' token
>
> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>
> First function: move ';' inside braces.
> Second function: drop the ';'.
Put the semicolons where it makes sense.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
include/net/ax25.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 8a7a122..5d23521 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -444,8 +444,8 @@ extern void ax25_uid_free(void);
extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
#else
-static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
-static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
+static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
+static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
#endif /* CONFIG_SYSCTL */
#endif
--
1.7.2.5
^ permalink raw reply related
* [PATCH] net ax25: Fix the build when sysctl support is disabled.
From: Eric W. Biederman @ 2012-04-24 0:25 UTC (permalink / raw)
To: David Miller
Cc: Stephen Rothwell, linux-next, LKML, netdev, linux-hams,
Ralf Baechle, Randy Dunlap
In-Reply-To: <4F95828A.8050403@xenotime.net>
Randy Dunlap <rdunlap@xenotime.net> reported:
> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120420:
>
>
> include/net/ax25.h:447:75: error: expected ';' before '}' token
>
> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>
> First function: move ';' inside braces.
> Second function: drop the ';'.
Put the semicolons where it makes sense.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
Resent to include David Miller.
include/net/ax25.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 8a7a122..5d23521 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -444,8 +444,8 @@ extern void ax25_uid_free(void);
extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
#else
-static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
-static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
+static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
+static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
#endif /* CONFIG_SYSCTL */
#endif
--
1.7.2.5
^ permalink raw reply related
* Re: linux-next: Tree for Apr 23 (ax.25 sysctl)
From: Eric W. Biederman @ 2012-04-24 0:16 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, netdev, linux-hams,
Ralf Baechle
In-Reply-To: <4F95828A.8050403@xenotime.net>
Randy Dunlap <rdunlap@xenotime.net> writes:
> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120420:
>
>
>
> include/net/ax25.h:447:75: error: expected ';' before '}' token
>
>
> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>
> Is this from Eric B.'s sysctl patches?
Sort of. I made the function per device and return 0.
I missed the inner ';' when I made the change. The outer '};' has
been there for years and has been weird but harmless.
Patch to fix it in a moment.
Eric
> First function: move ';' inside braces.
> Second function: drop the ';'.
^ permalink raw reply
* Re: [PATCH] net sysctl: Add place holder functions for when sysctl support is compiled out of the kernel.
From: David Miller @ 2012-04-23 23:24 UTC (permalink / raw)
To: rdunlap; +Cc: ebiederm, sfr, linux-next, linux-kernel, netdev
In-Reply-To: <4F95D9F5.3040407@xenotime.net>
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 23 Apr 2012 15:38:45 -0700
> On 04/23/2012 03:13 PM, Eric W. Biederman wrote:
>
>>
>> Randy Dunlap <rdunlap@xenotime.net> reported:
>>> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>>>
>>>> Hi all,
>>>>
>>>> Changes since 20120420:
>>>
>>>
>>>
>>> ERROR: "unregister_net_sysctl_table" [net/phonet/phonet.ko] undefined!
>>> ERROR: "register_net_sysctl" [net/phonet/phonet.ko] undefined!
>>>
>>> when CONFIG_SYSCTL is not enabled.
>>
>> Add static inline stub functions to gracefully handle the case when sysctl
>> support is not present.
>>
>> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
>
>
> Yep, that works.
>
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH] net sysctl: Add place holder functions for when sysctl support is compiled out of the kernel.
From: Randy Dunlap @ 2012-04-23 22:38 UTC (permalink / raw)
To: Eric W. Biederman
Cc: David Miller, Stephen Rothwell, linux-next, LKML, netdev
In-Reply-To: <m1lilmt7v5.fsf_-_@fess.ebiederm.org>
On 04/23/2012 03:13 PM, Eric W. Biederman wrote:
>
> Randy Dunlap <rdunlap@xenotime.net> reported:
>> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20120420:
>>
>>
>>
>> ERROR: "unregister_net_sysctl_table" [net/phonet/phonet.ko] undefined!
>> ERROR: "register_net_sysctl" [net/phonet/phonet.ko] undefined!
>>
>> when CONFIG_SYSCTL is not enabled.
>
> Add static inline stub functions to gracefully handle the case when sysctl
> support is not present.
>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Yep, that works.
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
> include/net/net_namespace.h | 15 ++++++++++++---
> 1 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
> index 3ee4a3d..ac9195e 100644
> --- a/include/net/net_namespace.h
> +++ b/include/net/net_namespace.h
> @@ -284,11 +284,20 @@ struct ctl_table_header;
>
> #ifdef CONFIG_SYSCTL
> extern int net_sysctl_init(void);
> -#else
> -static inline int net_sysctl_init(void) { return 0; }
> -#endif
> extern struct ctl_table_header *register_net_sysctl(struct net *net,
> const char *path, struct ctl_table *table);
> extern void unregister_net_sysctl_table(struct ctl_table_header *header);
> +#else
> +static inline int net_sysctl_init(void) { return 0; }
> +static inline struct ctl_table_header *register_net_sysctl(struct net *net,
> + const char *path, struct ctl_table *table)
> +{
> + return NULL;
> +}
> +static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
> +{
> +}
> +#endif
> +
>
> #endif /* __NET_NET_NAMESPACE_H */
--
~Randy
^ permalink raw reply
* [PATCH] net sysctl: Add place holder functions for when sysctl support is compiled out of the kernel.
From: Eric W. Biederman @ 2012-04-23 22:13 UTC (permalink / raw)
To: David Miller; +Cc: Stephen Rothwell, linux-next, LKML, netdev, Randy Dunlap
In-Reply-To: <4F958598.6080305@xenotime.net>
Randy Dunlap <rdunlap@xenotime.net> reported:
> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120420:
>
>
>
> ERROR: "unregister_net_sysctl_table" [net/phonet/phonet.ko] undefined!
> ERROR: "register_net_sysctl" [net/phonet/phonet.ko] undefined!
>
> when CONFIG_SYSCTL is not enabled.
Add static inline stub functions to gracefully handle the case when sysctl
support is not present.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
include/net/net_namespace.h | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 3ee4a3d..ac9195e 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -284,11 +284,20 @@ struct ctl_table_header;
#ifdef CONFIG_SYSCTL
extern int net_sysctl_init(void);
-#else
-static inline int net_sysctl_init(void) { return 0; }
-#endif
extern struct ctl_table_header *register_net_sysctl(struct net *net,
const char *path, struct ctl_table *table);
extern void unregister_net_sysctl_table(struct ctl_table_header *header);
+#else
+static inline int net_sysctl_init(void) { return 0; }
+static inline struct ctl_table_header *register_net_sysctl(struct net *net,
+ const char *path, struct ctl_table *table)
+{
+ return NULL;
+}
+static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
+{
+}
+#endif
+
#endif /* __NET_NET_NAMESPACE_H */
--
1.7.2.5
^ permalink raw reply related
* Re: [PATCH 2/2] usb/ssb: Add missing #include <linux/slab.h>
From: Hauke Mehrtens @ 2012-04-23 22:04 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Greg Kroah-Hartman, linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1335210932-9565-2-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
On 04/23/2012 09:55 PM, Geert Uytterhoeven wrote:
> m68k/allmodconfig:
>
> drivers/usb/host/ssb-hcd.c: In function ‘ssb_hcd_probe’:
> drivers/usb/host/ssb-hcd.c:170: error: implicit declaration of function ‘kzalloc’
> drivers/usb/host/ssb-hcd.c:170: warning: assignment makes pointer from integer without a cast
> drivers/usb/host/ssb-hcd.c:205: error: implicit declaration of function ‘kfree’
>
> Signed-off-by: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
Acked-by: Hauke Mehrtens <hauke-5/S+JYg5SzeELgA04lAiVw@public.gmane.org>
Hauke
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH 1/2] usb/bcma: Add missing #include <linux/slab.h>
From: Hauke Mehrtens @ 2012-04-23 22:03 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Greg Kroah-Hartman, linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1335210932-9565-1-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
On 04/23/2012 09:55 PM, Geert Uytterhoeven wrote:
> m68k/allmodconfig:
>
> drivers/usb/host/bcma-hcd.c: In function ‘bcma_hcd_probe’:
> drivers/usb/host/bcma-hcd.c:234: error: implicit declaration of function ‘kzalloc’
> drivers/usb/host/bcma-hcd.c:234: warning: assignment makes pointer from integer without a cast
> drivers/usb/host/bcma-hcd.c:264: error: implicit declaration of function ‘kfree’
>
> Signed-off-by: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
Acked-by: Hauke Mehrtens <hauke-5/S+JYg5SzeELgA04lAiVw@public.gmane.org>
Hauke
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH 2/2] usb/ssb: Add missing #include <linux/slab.h>
From: Geert Uytterhoeven @ 2012-04-23 19:55 UTC (permalink / raw)
To: Hauke Mehrtens, Greg Kroah-Hartman
Cc: linux-usb, linux-next, Geert Uytterhoeven
In-Reply-To: <1335210932-9565-1-git-send-email-geert@linux-m68k.org>
m68k/allmodconfig:
drivers/usb/host/ssb-hcd.c: In function ‘ssb_hcd_probe’:
drivers/usb/host/ssb-hcd.c:170: error: implicit declaration of function ‘kzalloc’
drivers/usb/host/ssb-hcd.c:170: warning: assignment makes pointer from integer without a cast
drivers/usb/host/ssb-hcd.c:205: error: implicit declaration of function ‘kfree’
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
http://kisskb.ellerman.id.au/kisskb/buildresult/6167030/
---
drivers/usb/host/ssb-hcd.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c
index c2e7343..c2a29fa 100644
--- a/drivers/usb/host/ssb-hcd.c
+++ b/drivers/usb/host/ssb-hcd.c
@@ -22,6 +22,7 @@
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/2] usb/bcma: Add missing #include <linux/slab.h>
From: Geert Uytterhoeven @ 2012-04-23 19:55 UTC (permalink / raw)
To: Hauke Mehrtens, Greg Kroah-Hartman
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA, Geert Uytterhoeven
m68k/allmodconfig:
drivers/usb/host/bcma-hcd.c: In function ‘bcma_hcd_probe’:
drivers/usb/host/bcma-hcd.c:234: error: implicit declaration of function ‘kzalloc’
drivers/usb/host/bcma-hcd.c:234: warning: assignment makes pointer from integer without a cast
drivers/usb/host/bcma-hcd.c:264: error: implicit declaration of function ‘kfree’
Signed-off-by: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
---
http://kisskb.ellerman.id.au/kisskb/buildresult/6167030/
---
drivers/usb/host/bcma-hcd.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
index 0b35d42..443da21 100644
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
@@ -22,6 +22,7 @@
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* Re: [-next] m68k proc_ops breakage
From: James Bottomley @ 2012-04-23 18:22 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Alexey Dobriyan, scsi, Linux-Next
In-Reply-To: <1332832945.2883.5.camel@dabdike>
On Tue, 2012-03-27 at 07:22 +0000, James Bottomley wrote:
> On Mon, 2012-03-26 at 22:06 +0200, Geert Uytterhoeven wrote:
> > m68k/defconfig:
> >
> > In file included from drivers/scsi/atari_scsi.c:1091:
> > drivers/scsi/atari_NCR5380.c: In function ‘NCR5380_print_status’:
> > drivers/scsi/atari_NCR5380.c:736: error: implicit declaration of
> > function ‘NCR5380_proc_info’
> > drivers/scsi/atari_NCR5380.c: At top level:
> > drivers/scsi/atari_NCR5380.c:767: error: static declaration of
> > ‘NCR5380_proc_info’ follows non-static declaration
> > drivers/scsi/atari_NCR5380.c:736: error: previous implicit declaration
> > of ‘NCR5380_proc_info’ was here
> > make[1]: *** [drivers/scsi/atari_scsi.o] Error 1
> >
> >
> > m68k/sun3_defconfig:
> >
> > In file included from drivers/scsi/sun3_scsi.c:628:
> > drivers/scsi/sun3_NCR5380.c: In function ‘NCR5380_print_status’:
> > drivers/scsi/sun3_NCR5380.c:678: error: implicit declaration of
> > function ‘sun3scsi_proc_info’
> > drivers/scsi/sun3_NCR5380.c: At top level:
> > drivers/scsi/sun3_NCR5380.c:709: error: static declaration of
> > ‘sun3scsi_proc_info’ follows non-static declaration
> > drivers/scsi/sun3_NCR5380.c:678: error: previous implicit declaration
> > of ‘sun3scsi_proc_info’ was here
> > make[1]: *** [drivers/scsi/sun3_scsi.o] Error 1
> >
> > In file included from drivers/scsi/sun3_scsi_vme.c:571:
> > drivers/scsi/sun3_NCR5380.c: In function ‘NCR5380_print_status’:
> > drivers/scsi/sun3_NCR5380.c:678: error: implicit declaration of
> > function ‘sun3scsi_proc_info’
> > drivers/scsi/sun3_NCR5380.c: At top level:
> > drivers/scsi/sun3_NCR5380.c:709: error: static declaration of
> > ‘sun3scsi_proc_info’ follows non-static declaration
> > drivers/scsi/sun3_NCR5380.c:678: error: previous implicit declaration
> > of ‘sun3scsi_proc_info’ was here
> > make[1]: *** [drivers/scsi/sun3_scsi_vme.o] Error 1
>
> Yes, the proc_ops conversion isn't quite ready. I'll hold it over to
> the next merge window so we can fix stuff like this.
OK, so I'd like to try pushing the proc-ops fixes for the next merge
window, but I think I'm still missing the fix for this.
James
^ permalink raw reply
* Re: linux-next: manual merge of the tty tree with the tty.current tree
From: Greg KH @ 2012-04-23 16:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tomoya MORINAGA
In-Reply-To: <20120419145951.4e1652ae5b1b80686892495d@canb.auug.org.au>
On Thu, Apr 19, 2012 at 02:59:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/pch_uart.c between commit af6d17cdc8c8 ("pch_uart: Fix
> dma channel unallocated issue") from the tty.current tree and commit
> 44db113212d8 ("pch_uart: Delete unused structure member") from the tty
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks for this, it should now be resolved in my tree.
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the usb tree
From: Greg KH @ 2012-04-23 16:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Masanari Iida
In-Reply-To: <20120423151146.8c5687c65c4eab16f063954c@canb.auug.org.au>
On Mon, Apr 23, 2012 at 03:11:46PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3
> ("USB: dt9812.c: remove err() usage") from the usb tree and commit
> 73e2918990c0 ("staging: Fix typo in multiple files") from the staging
> tree.
>
> The former supercedes the latter, so I used that.
Thanks, that sounds correct.
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for Apr 23 (phonet sysctl)
From: Randy Dunlap @ 2012-04-23 16:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, ebiederm, netdev
In-Reply-To: <20120423170701.c96e402234b1387dece11dda@canb.auug.org.au>
On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20120420:
ERROR: "unregister_net_sysctl_table" [net/phonet/phonet.ko] undefined!
ERROR: "register_net_sysctl" [net/phonet/phonet.ko] undefined!
when CONFIG_SYSCTL is not enabled.
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for Apr 23 (ax.25 sysctl)
From: Randy Dunlap @ 2012-04-23 16:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, netdev, linux-hams, Ralf Baechle
In-Reply-To: <20120423170701.c96e402234b1387dece11dda@canb.auug.org.au>
On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20120420:
include/net/ax25.h:447:75: error: expected ';' before '}' token
static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
Is this from Eric B.'s sysctl patches?
First function: move ';' inside braces.
Second function: drop the ';'.
--
~Randy
^ permalink raw reply
* Re: linux-next: build warning after merge of the security tree
From: Kees Cook @ 2012-04-23 15:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: James Morris, linux-next, linux-kernel
In-Reply-To: <20120423165630.b412159ec0e5412ba41e0a98@canb.auug.org.au>
On Sun, Apr 22, 2012 at 11:56 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the security tree, today's linux-next build (powerpc
> allyesconfig) produced this warning:
>
> security/yama/yama_lsm.c:322:12: warning: 'one' defined but not used [-Wunused-variable]
>
> Introduced by commit 389da25f93ee ("Yama: add additional ptrace scopes").
Thanks! This has already been taken care of:
http://marc.info/?l=linux-security-module&m=133516581114617&w=2
-Kees
--
Kees Cook
Chrome OS Security
^ permalink raw reply
* Re: linux-next: manual merge of the modem-shm tree with the driver-core tree
From: Greg KH @ 2012-04-23 14:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, "Sjur Brændeland", linux-next,
linux-kernel, MyungJoo Ham
In-Reply-To: <20120423154420.09f149266ae36bb8e08b4207@canb.auug.org.au>
On Mon, Apr 23, 2012 at 03:44:20PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the modem-shm tree got a conflict in
> drivers/Kconfig between commit de55d8716ac5 ("Extcon (external
> connector): import Android's switch class and modify") from the
> driver-core tree and commit 021fd6178bcd ("modem_shm: Makefile and
> Kconfig for M7400 Shared Memory Drivers") from the modem-shm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good, thanks for doing this.
greg k-h
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox