* Re: Can you add the binfmt_misc tree to linux-next?
From: Stephen Rothwell @ 2016-06-27 23:29 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, linux-fsdevel, Linux Containers
In-Reply-To: <1467044198.2264.19.camel@HansenPartnership.com>
Hi James,
On Mon, 27 Jun 2016 09:16:38 -0700 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> Since I'd effectively become binfmt_misc maintainer when these patches
> get merged on the last person to touch it owns it principle, it makes
> sense to begin now more formally. The tree is at
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git for-next
>
> It currently contains four patches adding the container emulation
> infrastructure from the persistent-handlers branch.
Added from today. I only found 3 patches, though:
4af75df6a410 binfmt_misc: add F option description to documentation
948b701a607f binfmt_misc: add persistent opened binary handler for containers
9a08c352d053 fs: add filp_clone_open API
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgement of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (pinctrl && !CONFIG_OF)
From: Arnd Bergmann @ 2016-06-27 21:36 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, linux-gpio,
devicetree@vger.kernel.org, Linus Torvalds,
Linus Walleij (linus.walleij@linaro.org), Alexander Stein
In-Reply-To: <57716D3D.4070302@infradead.org>
On Monday, June 27, 2016 11:15:25 AM CEST Randy Dunlap wrote:
> On 06/26/16 23:39, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20160624:
> >
>
> on i386, when CONFIG_OF is not enabled ...
> but OF_GPIO is enabled due to this in drivers/gpio/Kconfig:
>
> config OF_GPIO
> def_bool y
> depends on OF || COMPILE_TEST
>
> (above from commit 1e4a80640338924b9f9fd7a121ac31d08134410a
> from Alexander Stein <alexanders83@web.de>)
>
>
> ../drivers/pinctrl/bcm/pinctrl-iproc-gpio.c:381:20: error: 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
> ../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error: 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a function)
> ../drivers/pinctrl/bcm/pinctrl-nsp-gpio.c:365:20: error: 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
>
> because that function is only present when CONFIG_OF is enabled.
>
>
> Also, why does that commit (1e4a80640338924b9f9fd7a121ac31d08134410a)
> not have any other S-O-B lines in it? like whoever merged it?
(adding Linus Walleij and Alexander Stein to Cc)
Unfortunately, the changelog also doesn't say what triggered that
change. I guess there was a driver that did 'select OF_GPIO'
and had a dependency on COMPILE_TEST, though I don't see any
driver doing that in linux-next.
I think the commit should just be reverted, it clearly breaks
stuff, and whatever needs it can be fixed in a better way.
Specifically, we have three ways that the OF_GPIO symbol
is used:
a) it is implicitly enabled when both GPIOLIB and OF are turned on
b) some drivers 'depends on OF_GPIO'
c) some other drivers 'select OF_GPIO'
The combination of b) and c) can easily lead to circular dependencies,
and is also confusing. It would be better to change all of those
to 'depends on'.
Arnd
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (pinctrl && !CONFIG_OF)
From: Randy Dunlap @ 2016-06-27 18:15 UTC (permalink / raw)
To: Stephen Rothwell, linux-next
Cc: linux-kernel, linux-gpio, devicetree@vger.kernel.org,
Arnd Bergmann, Linus Torvalds
In-Reply-To: <20160627163939.20e454d5@canb.auug.org.au>
On 06/26/16 23:39, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160624:
>
on i386, when CONFIG_OF is not enabled ...
but OF_GPIO is enabled due to this in drivers/gpio/Kconfig:
config OF_GPIO
def_bool y
depends on OF || COMPILE_TEST
(above from commit 1e4a80640338924b9f9fd7a121ac31d08134410a
from Alexander Stein <alexanders83@web.de>)
../drivers/pinctrl/bcm/pinctrl-iproc-gpio.c:381:20: error: 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error: 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a function)
../drivers/pinctrl/bcm/pinctrl-nsp-gpio.c:365:20: error: 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
because that function is only present when CONFIG_OF is enabled.
Also, why does that commit (1e4a80640338924b9f9fd7a121ac31d08134410a)
not have any other S-O-B lines in it? like whoever merged it?
--
~Randy
^ permalink raw reply
* Can you add the binfmt_misc tree to linux-next?
From: James Bottomley @ 2016-06-27 16:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-fsdevel, Linux Containers
Since I'd effectively become binfmt_misc maintainer when these patches
get merged on the last person to touch it owns it principle, it makes
sense to begin now more formally. The tree is at
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git for-next
It currently contains four patches adding the container emulation
infrastructure from the persistent-handlers branch.
Thanks,
James
^ permalink raw reply
* Re: linux-next: manual merge of the jc_docs tree with the drm tree
From: Jonathan Corbet @ 2016-06-27 15:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, linux-next, linux-kernel, Jani Nikula, Daniel Vetter
In-Reply-To: <20160627133124.4e3e8dfd@canb.auug.org.au>
On Mon, 27 Jun 2016 13:31:24 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/index.rst
>
> between commit:
>
> cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl")
>
> from the drm tree and commit:
>
> 17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc")
>
> from the jc_docs tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Sigh, I fear that index.rst could become a bit of a conflict magnet, at
least in the near future as documents are being added.
The fix is obviously correct, thanks.
jon
^ permalink raw reply
* Re: linux-next: build failure after merge of the nfs tree
From: Trond Myklebust @ 2016-06-27 15:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: List Linux Next Mailing, linux-kernel
In-Reply-To: <20160627105839.763d6d22@canb.auug.org.au>
> On Jun 26, 2016, at 20:58, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Trond,
>
> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> fs/nfs/pnfs_nfs.c: In function 'pnfs_nfs_generic_sync':
> fs/nfs/pnfs_nfs.c:947:8: error: too few arguments to function 'nfs_commit_inode'
> ret = nfs_commit_inode(inode);
> ^
> In file included from fs/nfs/pnfs_nfs.c:10:0:
> include/linux/nfs_fs.h:509:13: note: declared here
> extern int nfs_commit_inode(struct inode *, int);
> ^
>
> Caused by commit
>
> 292cc573fce6 ("pNFS: Files and flexfiles always need to commit before layoutcommit")
>
> I have used the nsf tree from next-20160624 for today
>
Hi Stephen,
My apologies: That was a last minute typo when amending a commit. I’ve fixed the code in today’s linux-next branch.
Cheers
Trond--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: lots of repeated patches in the tpmdd tree
From: Jarkko Sakkinen @ 2016-06-27 12:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160627093646.58390c59@canb.auug.org.au>
On Mon, Jun 27, 2016 at 09:36:46AM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
>
> I noticed that a large number of the patches in the tpmdd tree appear
> twice (and some three times). They appear to have been rebased on top
> of the security tree before being remerged. Please clean this all up.
Cleaned up. Thanks (and sorry).
> --
> Cheers,
> Stephen Rothwell
/Jarkko
^ permalink raw reply
* [PATCH] drm/i915: fix build errors when ACPI is not enabled
From: Jani Nikula @ 2016-06-27 11:53 UTC (permalink / raw)
To: Randy Dunlap, LKML, linux-next@vger.kernel.org
Cc: Daniel Vetter, Jani Nikula, intel-gfx, dri-devel, Jani Nikula,
drm-intel-fixes, Chris Wilson
In-Reply-To: <576EC660.3000806@infradead.org>
From: Randy Dunlap <rdunlap@infradead.org>
Fix build errors when ACPI is not enabled by adding function stubs:
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
intel_opregion_unregister(dev_priv);
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
intel_opregion_register(dev_priv);
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Fixes: 03d92e4779b8 ("drm/i915/opregion: Rename init/fini functions to register/unregister")
Cc: drm-intel-fixes@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
[Jani: dropped the stale init/fini declarations]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9ef491975812..724d34b00196 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3694,8 +3694,8 @@ extern int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,
extern int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv);
#else
static inline int intel_opregion_setup(struct drm_i915_private *dev) { return 0; }
-static inline void intel_opregion_init(struct drm_i915_private *dev) { }
-static inline void intel_opregion_fini(struct drm_i915_private *dev) { }
+static inline void intel_opregion_register(struct drm_i915_private *dev_priv) { }
+static inline void intel_opregion_unregister(struct drm_i915_private *dev_priv) { }
static inline void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
{
}
--
2.1.4
^ permalink raw reply related
* Re: [PATCH] mwifiex: Reduce endian conversion for REG Host Commands
From: Kalle Valo @ 2016-06-27 11:00 UTC (permalink / raw)
To: Prasun Maiti
Cc: Amitkumar Karwar, Nishant Sarmukadam, Linux Wireless, Linux Next,
Linux Kernel
In-Reply-To: <CAEO8o4k=2vwtYfQjJb_oKGNFcOpMDD9LSsniwJi6m74wncgZgg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
Prasun Maiti <prasunmaiti87-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
>> If you send a new version of the patch mark it as [PATCH v2] and always
>> include a change log so that people don't need to guess what has
>> changed:
>>
>> http://kernelnewbies.org/FirstKernelPatch#head-5c81b3c517a1d0bbc24f92594cb734e155fcbbcb
>>
>> So now you should send a v3 and include a changelog.
>
> Hi Kalle Valo,
>
> In PATCH v3, the whole changes remains? Or only it contains last
> modification on PATCH v2 ? Please let me know about it.
I haven't applied anything yet, so please send v3 as the full patch. But
I see that you already did that.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" 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 v4] mwifiex: Reduce endian conversion for REG Host Commands
From: Prasun Maiti @ 2016-06-27 10:13 UTC (permalink / raw)
To: Amitkumar Karwar
Cc: Nishant Sarmukadam, Linux Wireless, Linux Next, Linux Kernel,
Kalle Valo
In-Reply-To: <39f33dff10344e53b0fbbc9681f90b33@SC-EXCH04.marvell.com>
For multiple REG Host Commands (e.g HostCmd_CMD_802_11_EEPROM_ACCESS,
HostCmd_CMD_MAC_REG_ACCESS etc.) "cpu_to_leX"-converted values are
saved to driver. So, "leX_to_cpu" conversion is required too many
times afterwards in driver.
This patch reduces the endian: conversion without saving "cpu_to_leX"
converted values in driver. This will convert endianness in prepare
command and command response path.
Signed-off-by: Prasun Maiti <prasunmaiti87@gmail.com>
---
Changes in v3:
- Fixed the following warnings:
* sta_ioctl.c:1339:34: warning: comparison of distinct pointer types lacks a cast [enabled by default]
* sta_cmdresp.c:821:6: warning: comparison of distinct pointer types lacks a cast [enabled by default]
Changes in v4:
- Fixed the sparse compilation warnings:
* warning: cast from restricted __le32
* warning: cast from restricted __le16
drivers/net/wireless/marvell/mwifiex/ioctl.h | 10 +++---
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 28 +++++++---------
drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 37 +++++++++++-----------
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 21 ++++++------
4 files changed, 46 insertions(+), 50 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
index a5a48c1..4ce9330 100644
--- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
+++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
@@ -341,16 +341,16 @@ enum {
};
struct mwifiex_ds_reg_rw {
- __le32 type;
- __le32 offset;
- __le32 value;
+ u32 type;
+ u32 offset;
+ u32 value;
};
#define MAX_EEPROM_DATA 256
struct mwifiex_ds_read_eeprom {
- __le16 offset;
- __le16 byte_count;
+ u16 offset;
+ u16 byte_count;
u8 value[MAX_EEPROM_DATA];
};
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index e436574..9df02ba 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -1130,9 +1130,8 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
cmd->size = cpu_to_le16(sizeof(*mac_reg) + S_DS_GEN);
mac_reg = &cmd->params.mac_reg;
mac_reg->action = cpu_to_le16(cmd_action);
- mac_reg->offset =
- cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
- mac_reg->value = reg_rw->value;
+ mac_reg->offset = cpu_to_le16((u16) reg_rw->offset);
+ mac_reg->value = cpu_to_le32(reg_rw->value);
break;
}
case HostCmd_CMD_BBP_REG_ACCESS:
@@ -1142,9 +1141,8 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
cmd->size = cpu_to_le16(sizeof(*bbp_reg) + S_DS_GEN);
bbp_reg = &cmd->params.bbp_reg;
bbp_reg->action = cpu_to_le16(cmd_action);
- bbp_reg->offset =
- cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
- bbp_reg->value = (u8) le32_to_cpu(reg_rw->value);
+ bbp_reg->offset = cpu_to_le16((u16) reg_rw->offset);
+ bbp_reg->value = (u8) reg_rw->value;
break;
}
case HostCmd_CMD_RF_REG_ACCESS:
@@ -1154,8 +1152,8 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
cmd->size = cpu_to_le16(sizeof(*rf_reg) + S_DS_GEN);
rf_reg = &cmd->params.rf_reg;
rf_reg->action = cpu_to_le16(cmd_action);
- rf_reg->offset = cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
- rf_reg->value = (u8) le32_to_cpu(reg_rw->value);
+ rf_reg->offset = cpu_to_le16((u16) reg_rw->offset);
+ rf_reg->value = (u8) reg_rw->value;
break;
}
case HostCmd_CMD_PMIC_REG_ACCESS:
@@ -1165,9 +1163,8 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
cmd->size = cpu_to_le16(sizeof(*pmic_reg) + S_DS_GEN);
pmic_reg = &cmd->params.pmic_reg;
pmic_reg->action = cpu_to_le16(cmd_action);
- pmic_reg->offset =
- cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
- pmic_reg->value = (u8) le32_to_cpu(reg_rw->value);
+ pmic_reg->offset = cpu_to_le16((u16) reg_rw->offset);
+ pmic_reg->value = (u8) reg_rw->value;
break;
}
case HostCmd_CMD_CAU_REG_ACCESS:
@@ -1177,9 +1174,8 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
cmd->size = cpu_to_le16(sizeof(*cau_reg) + S_DS_GEN);
cau_reg = &cmd->params.rf_reg;
cau_reg->action = cpu_to_le16(cmd_action);
- cau_reg->offset =
- cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
- cau_reg->value = (u8) le32_to_cpu(reg_rw->value);
+ cau_reg->offset = cpu_to_le16((u16) reg_rw->offset);
+ cau_reg->value = (u8) reg_rw->value;
break;
}
case HostCmd_CMD_802_11_EEPROM_ACCESS:
@@ -1190,8 +1186,8 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
cmd->size = cpu_to_le16(sizeof(*cmd_eeprom) + S_DS_GEN);
cmd_eeprom->action = cpu_to_le16(cmd_action);
- cmd_eeprom->offset = rd_eeprom->offset;
- cmd_eeprom->byte_count = rd_eeprom->byte_count;
+ cmd_eeprom->offset = cpu_to_le16(rd_eeprom->offset);
+ cmd_eeprom->byte_count = cpu_to_le16(rd_eeprom->byte_count);
cmd_eeprom->value = 0;
break;
}
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index d18c797..1832511 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -781,45 +781,44 @@ static int mwifiex_ret_reg_access(u16 type, struct host_cmd_ds_command *resp,
switch (type) {
case HostCmd_CMD_MAC_REG_ACCESS:
r.mac = &resp->params.mac_reg;
- reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.mac->offset));
- reg_rw->value = r.mac->value;
+ reg_rw->offset = (u32) le16_to_cpu(r.mac->offset);
+ reg_rw->value = le32_to_cpu(r.mac->value);
break;
case HostCmd_CMD_BBP_REG_ACCESS:
r.bbp = &resp->params.bbp_reg;
- reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.bbp->offset));
- reg_rw->value = cpu_to_le32((u32) r.bbp->value);
+ reg_rw->offset = (u32) le16_to_cpu(r.bbp->offset);
+ reg_rw->value = (u32) r.bbp->value;
break;
case HostCmd_CMD_RF_REG_ACCESS:
r.rf = &resp->params.rf_reg;
- reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
- reg_rw->value = cpu_to_le32((u32) r.bbp->value);
+ reg_rw->offset = (u32) le16_to_cpu(r.rf->offset);
+ reg_rw->value = (u32) r.bbp->value;
break;
case HostCmd_CMD_PMIC_REG_ACCESS:
r.pmic = &resp->params.pmic_reg;
- reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.pmic->offset));
- reg_rw->value = cpu_to_le32((u32) r.pmic->value);
+ reg_rw->offset = (u32) le16_to_cpu(r.pmic->offset);
+ reg_rw->value = (u32) r.pmic->value;
break;
case HostCmd_CMD_CAU_REG_ACCESS:
r.rf = &resp->params.rf_reg;
- reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
- reg_rw->value = cpu_to_le32((u32) r.rf->value);
+ reg_rw->offset = (u32) le16_to_cpu(r.rf->offset);
+ reg_rw->value = (u32) r.rf->value;
break;
case HostCmd_CMD_802_11_EEPROM_ACCESS:
r.eeprom = &resp->params.eeprom;
- pr_debug("info: EEPROM read len=%x\n", r.eeprom->byte_count);
- if (le16_to_cpu(eeprom->byte_count) <
- le16_to_cpu(r.eeprom->byte_count)) {
- eeprom->byte_count = cpu_to_le16(0);
+ pr_debug("info: EEPROM read len=%x\n",
+ le16_to_cpu(r.eeprom->byte_count));
+ if (eeprom->byte_count < le16_to_cpu(r.eeprom->byte_count)) {
+ eeprom->byte_count = 0;
pr_debug("info: EEPROM read length is too big\n");
return -1;
}
- eeprom->offset = r.eeprom->offset;
- eeprom->byte_count = r.eeprom->byte_count;
- if (le16_to_cpu(eeprom->byte_count) > 0)
+ eeprom->offset = le16_to_cpu(r.eeprom->offset);
+ eeprom->byte_count = le16_to_cpu(r.eeprom->byte_count);
+ if (eeprom->byte_count > 0)
memcpy(&eeprom->value, &r.eeprom->value,
- le16_to_cpu(r.eeprom->byte_count));
-
+ min((u16)MAX_EEPROM_DATA, eeprom->byte_count));
break;
default:
return -1;
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index 8e08626..6dab5ca 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -1247,7 +1247,7 @@ static int mwifiex_reg_mem_ioctl_reg_rw(struct mwifiex_private *priv,
{
u16 cmd_no;
- switch (le32_to_cpu(reg_rw->type)) {
+ switch (reg_rw->type) {
case MWIFIEX_REG_MAC:
cmd_no = HostCmd_CMD_MAC_REG_ACCESS;
break;
@@ -1282,9 +1282,9 @@ mwifiex_reg_write(struct mwifiex_private *priv, u32 reg_type,
{
struct mwifiex_ds_reg_rw reg_rw;
- reg_rw.type = cpu_to_le32(reg_type);
- reg_rw.offset = cpu_to_le32(reg_offset);
- reg_rw.value = cpu_to_le32(reg_value);
+ reg_rw.type = reg_type;
+ reg_rw.offset = reg_offset;
+ reg_rw.value = reg_value;
return mwifiex_reg_mem_ioctl_reg_rw(priv, ®_rw, HostCmd_ACT_GEN_SET);
}
@@ -1302,14 +1302,14 @@ mwifiex_reg_read(struct mwifiex_private *priv, u32 reg_type,
int ret;
struct mwifiex_ds_reg_rw reg_rw;
- reg_rw.type = cpu_to_le32(reg_type);
- reg_rw.offset = cpu_to_le32(reg_offset);
+ reg_rw.type = reg_type;
+ reg_rw.offset = reg_offset;
ret = mwifiex_reg_mem_ioctl_reg_rw(priv, ®_rw, HostCmd_ACT_GEN_GET);
if (ret)
goto done;
- *value = le32_to_cpu(reg_rw.value);
+ *value = reg_rw.value;
done:
return ret;
@@ -1328,15 +1328,16 @@ mwifiex_eeprom_read(struct mwifiex_private *priv, u16 offset, u16 bytes,
int ret;
struct mwifiex_ds_read_eeprom rd_eeprom;
- rd_eeprom.offset = cpu_to_le16((u16) offset);
- rd_eeprom.byte_count = cpu_to_le16((u16) bytes);
+ rd_eeprom.offset = offset;
+ rd_eeprom.byte_count = bytes;
/* Send request to firmware */
ret = mwifiex_send_cmd(priv, HostCmd_CMD_802_11_EEPROM_ACCESS,
HostCmd_ACT_GEN_GET, 0, &rd_eeprom, true);
if (!ret)
- memcpy(value, rd_eeprom.value, MAX_EEPROM_DATA);
+ memcpy(value, rd_eeprom.value, min((u16)MAX_EEPROM_DATA,
+ rd_eeprom.byte_count));
return ret;
}
--
1.9.1
^ permalink raw reply related
* next-20160627 build: 2 failures 4 warnings (next-20160627)
From: Build bot for Mark Brown @ 2016-06-27 9:29 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160627
Git describe: next-20160627
Commit: aa20c9aa49 Add linux-next specific files for 20160627
Build Time: 74 min 50 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 0
Warnings: 4
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 4
1 ../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: its scope is only this definition or declaration, which is probably not what you want
1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: 'struct device_node' declared inside parameter list
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../arch/arm/mach-s3c64xx/common.h:28:2: warning: 'struct device_node' declared inside parameter list
../arch/arm/mach-s3c64xx/common.h:28:2: warning: its scope is only this definition or declaration, which is probably not what you want
../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm64-defconfig
^ permalink raw reply
* RE: [PATCH v3] mwifiex: Reduce endian conversion for REG Host Commands
From: Amitkumar Karwar @ 2016-06-27 7:02 UTC (permalink / raw)
To: Prasun Maiti
Cc: Nishant Sarmukadam, Linux Wireless, Linux Next, Linux Kernel,
Kalle Valo
In-Reply-To: <1466659753-13146-1-git-send-email-prasunmaiti87@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 10395 bytes --]
Hi Prasun,
> From: Prasun Maiti [mailto:prasunmaiti87@gmail.com]
> Sent: Thursday, June 23, 2016 10:59 AM
> To: Amitkumar Karwar
> Cc: Nishant Sarmukadam; Linux Wireless; Linux Next; Linux Kernel; Kalle
> Valo
> Subject: [PATCH v3] mwifiex: Reduce endian conversion for REG Host
> Commands
>
> For multiple REG Host Commands (e.g HostCmd_CMD_802_11_EEPROM_ACCESS,
> HostCmd_CMD_MAC_REG_ACCESS etc.) "cpu_to_leX"-converted values are saved
> to driver. So, "leX_to_cpu" conversion is required too many times
> afterwards in driver.
>
> This patch reduces the endian: conversion without saving "cpu_to_leX"
> converted values in driver. This will convert endianness in prepare
> command and command response path.
>
> Signed-off-by: Prasun Maiti <prasunmaiti87@gmail.com>
> ---
> Changes in v3:
> - Fixed the following warnings:
> * sta_ioctl.c:1339:34: warning: comparison of distinct pointer
> types lacks a cast [enabled by default]
> * sta_cmdresp.c:821:6: warning: comparison of distinct pointer
> types lacks a cast [enabled by default]
>
> drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 28 +++++++--------
> -
> drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 37 +++++++++++----
> -------
> drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 21 ++++++------
> 3 files changed, 41 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> index e436574..9df02ba 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> @@ -1130,9 +1130,8 @@ static int mwifiex_cmd_reg_access(struct
> host_cmd_ds_command *cmd,
> cmd->size = cpu_to_le16(sizeof(*mac_reg) + S_DS_GEN);
> mac_reg = &cmd->params.mac_reg;
> mac_reg->action = cpu_to_le16(cmd_action);
> - mac_reg->offset =
> - cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
> - mac_reg->value = reg_rw->value;
> + mac_reg->offset = cpu_to_le16((u16) reg_rw->offset);
> + mac_reg->value = cpu_to_le32(reg_rw->value);
> break;
> }
> case HostCmd_CMD_BBP_REG_ACCESS:
> @@ -1142,9 +1141,8 @@ static int mwifiex_cmd_reg_access(struct
> host_cmd_ds_command *cmd,
> cmd->size = cpu_to_le16(sizeof(*bbp_reg) + S_DS_GEN);
> bbp_reg = &cmd->params.bbp_reg;
> bbp_reg->action = cpu_to_le16(cmd_action);
> - bbp_reg->offset =
> - cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
> - bbp_reg->value = (u8) le32_to_cpu(reg_rw->value);
> + bbp_reg->offset = cpu_to_le16((u16) reg_rw->offset);
> + bbp_reg->value = (u8) reg_rw->value;
> break;
> }
> case HostCmd_CMD_RF_REG_ACCESS:
> @@ -1154,8 +1152,8 @@ static int mwifiex_cmd_reg_access(struct
> host_cmd_ds_command *cmd,
> cmd->size = cpu_to_le16(sizeof(*rf_reg) + S_DS_GEN);
> rf_reg = &cmd->params.rf_reg;
> rf_reg->action = cpu_to_le16(cmd_action);
> - rf_reg->offset = cpu_to_le16((u16) le32_to_cpu(reg_rw-
> >offset));
> - rf_reg->value = (u8) le32_to_cpu(reg_rw->value);
> + rf_reg->offset = cpu_to_le16((u16) reg_rw->offset);
> + rf_reg->value = (u8) reg_rw->value;
> break;
> }
> case HostCmd_CMD_PMIC_REG_ACCESS:
> @@ -1165,9 +1163,8 @@ static int mwifiex_cmd_reg_access(struct
> host_cmd_ds_command *cmd,
> cmd->size = cpu_to_le16(sizeof(*pmic_reg) + S_DS_GEN);
> pmic_reg = &cmd->params.pmic_reg;
> pmic_reg->action = cpu_to_le16(cmd_action);
> - pmic_reg->offset =
> - cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
> - pmic_reg->value = (u8) le32_to_cpu(reg_rw->value);
> + pmic_reg->offset = cpu_to_le16((u16) reg_rw->offset);
> + pmic_reg->value = (u8) reg_rw->value;
> break;
> }
> case HostCmd_CMD_CAU_REG_ACCESS:
> @@ -1177,9 +1174,8 @@ static int mwifiex_cmd_reg_access(struct
> host_cmd_ds_command *cmd,
> cmd->size = cpu_to_le16(sizeof(*cau_reg) + S_DS_GEN);
> cau_reg = &cmd->params.rf_reg;
> cau_reg->action = cpu_to_le16(cmd_action);
> - cau_reg->offset =
> - cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
> - cau_reg->value = (u8) le32_to_cpu(reg_rw->value);
> + cau_reg->offset = cpu_to_le16((u16) reg_rw->offset);
> + cau_reg->value = (u8) reg_rw->value;
> break;
> }
> case HostCmd_CMD_802_11_EEPROM_ACCESS:
> @@ -1190,8 +1186,8 @@ static int mwifiex_cmd_reg_access(struct
> host_cmd_ds_command *cmd,
>
> cmd->size = cpu_to_le16(sizeof(*cmd_eeprom) + S_DS_GEN);
> cmd_eeprom->action = cpu_to_le16(cmd_action);
> - cmd_eeprom->offset = rd_eeprom->offset;
> - cmd_eeprom->byte_count = rd_eeprom->byte_count;
> + cmd_eeprom->offset = cpu_to_le16(rd_eeprom->offset);
> + cmd_eeprom->byte_count = cpu_to_le16(rd_eeprom->byte_count);
> cmd_eeprom->value = 0;
> break;
> }
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
> b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
> index d18c797..1832511 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
> @@ -781,45 +781,44 @@ static int mwifiex_ret_reg_access(u16 type, struct
> host_cmd_ds_command *resp,
> switch (type) {
> case HostCmd_CMD_MAC_REG_ACCESS:
> r.mac = &resp->params.mac_reg;
> - reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.mac-
> >offset));
> - reg_rw->value = r.mac->value;
> + reg_rw->offset = (u32) le16_to_cpu(r.mac->offset);
> + reg_rw->value = le32_to_cpu(r.mac->value);
> break;
> case HostCmd_CMD_BBP_REG_ACCESS:
> r.bbp = &resp->params.bbp_reg;
> - reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.bbp-
> >offset));
> - reg_rw->value = cpu_to_le32((u32) r.bbp->value);
> + reg_rw->offset = (u32) le16_to_cpu(r.bbp->offset);
> + reg_rw->value = (u32) r.bbp->value;
> break;
>
> case HostCmd_CMD_RF_REG_ACCESS:
> r.rf = &resp->params.rf_reg;
> - reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf-
> >offset));
> - reg_rw->value = cpu_to_le32((u32) r.bbp->value);
> + reg_rw->offset = (u32) le16_to_cpu(r.rf->offset);
> + reg_rw->value = (u32) r.bbp->value;
> break;
> case HostCmd_CMD_PMIC_REG_ACCESS:
> r.pmic = &resp->params.pmic_reg;
> - reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.pmic-
> >offset));
> - reg_rw->value = cpu_to_le32((u32) r.pmic->value);
> + reg_rw->offset = (u32) le16_to_cpu(r.pmic->offset);
> + reg_rw->value = (u32) r.pmic->value;
> break;
> case HostCmd_CMD_CAU_REG_ACCESS:
> r.rf = &resp->params.rf_reg;
> - reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf-
> >offset));
> - reg_rw->value = cpu_to_le32((u32) r.rf->value);
> + reg_rw->offset = (u32) le16_to_cpu(r.rf->offset);
> + reg_rw->value = (u32) r.rf->value;
> break;
> case HostCmd_CMD_802_11_EEPROM_ACCESS:
> r.eeprom = &resp->params.eeprom;
> - pr_debug("info: EEPROM read len=%x\n", r.eeprom-
> >byte_count);
> - if (le16_to_cpu(eeprom->byte_count) <
> - le16_to_cpu(r.eeprom->byte_count)) {
> - eeprom->byte_count = cpu_to_le16(0);
> + pr_debug("info: EEPROM read len=%x\n",
> + le16_to_cpu(r.eeprom->byte_count));
> + if (eeprom->byte_count < le16_to_cpu(r.eeprom->byte_count))
> {
> + eeprom->byte_count = 0;
> pr_debug("info: EEPROM read length is too big\n");
> return -1;
> }
> - eeprom->offset = r.eeprom->offset;
> - eeprom->byte_count = r.eeprom->byte_count;
> - if (le16_to_cpu(eeprom->byte_count) > 0)
> + eeprom->offset = le16_to_cpu(r.eeprom->offset);
> + eeprom->byte_count = le16_to_cpu(r.eeprom->byte_count);
> + if (eeprom->byte_count > 0)
> memcpy(&eeprom->value, &r.eeprom->value,
> - le16_to_cpu(r.eeprom->byte_count));
> -
> + min((u16)MAX_EEPROM_DATA, eeprom->byte_count));
> break;
> default:
> return -1;
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> index 8e08626..6dab5ca 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> @@ -1247,7 +1247,7 @@ static int mwifiex_reg_mem_ioctl_reg_rw(struct
> mwifiex_private *priv, {
> u16 cmd_no;
>
> - switch (le32_to_cpu(reg_rw->type)) {
> + switch (reg_rw->type) {
> case MWIFIEX_REG_MAC:
> cmd_no = HostCmd_CMD_MAC_REG_ACCESS;
> break;
> @@ -1282,9 +1282,9 @@ mwifiex_reg_write(struct mwifiex_private *priv,
> u32 reg_type, {
> struct mwifiex_ds_reg_rw reg_rw;
>
> - reg_rw.type = cpu_to_le32(reg_type);
> - reg_rw.offset = cpu_to_le32(reg_offset);
> - reg_rw.value = cpu_to_le32(reg_value);
> + reg_rw.type = reg_type;
> + reg_rw.offset = reg_offset;
> + reg_rw.value = reg_value;
>
> return mwifiex_reg_mem_ioctl_reg_rw(priv, ®_rw,
> HostCmd_ACT_GEN_SET); } @@ -1302,14 +1302,14 @@ mwifiex_reg_read(struct
> mwifiex_private *priv, u32 reg_type,
> int ret;
> struct mwifiex_ds_reg_rw reg_rw;
>
> - reg_rw.type = cpu_to_le32(reg_type);
> - reg_rw.offset = cpu_to_le32(reg_offset);
> + reg_rw.type = reg_type;
> + reg_rw.offset = reg_offset;
> ret = mwifiex_reg_mem_ioctl_reg_rw(priv, ®_rw,
> HostCmd_ACT_GEN_GET);
>
> if (ret)
> goto done;
>
> - *value = le32_to_cpu(reg_rw.value);
> + *value = reg_rw.value;
>
> done:
> return ret;
> @@ -1328,15 +1328,16 @@ mwifiex_eeprom_read(struct mwifiex_private
> *priv, u16 offset, u16 bytes,
> int ret;
> struct mwifiex_ds_read_eeprom rd_eeprom;
>
> - rd_eeprom.offset = cpu_to_le16((u16) offset);
> - rd_eeprom.byte_count = cpu_to_le16((u16) bytes);
> + rd_eeprom.offset = offset;
> + rd_eeprom.byte_count = bytes;
>
> /* Send request to firmware */
> ret = mwifiex_send_cmd(priv, HostCmd_CMD_802_11_EEPROM_ACCESS,
> HostCmd_ACT_GEN_GET, 0, &rd_eeprom, true);
>
> if (!ret)
> - memcpy(value, rd_eeprom.value, MAX_EEPROM_DATA);
> + memcpy(value, rd_eeprom.value, min((u16)MAX_EEPROM_DATA,
> + rd_eeprom.byte_count));
> return ret;
> }
>
I can see attached sparse compilation warnings with your patch.
Sparse info: https://www.kernel.org/doc/Documentation/sparse.txt
I suppose you need to change structure definitions as well. __le16/__le32 members should now be defined as u16/u32 to resolve the warnings. Please prepare updated version with the change.
Regards,
Amitkumar
[-- Attachment #2: sparse.txt --]
[-- Type: text/plain, Size: 12349 bytes --]
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1250:23: warning: restricted __le32 degrades to integer
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1250:23: warning: restricted __le32 degrades to integer
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1250:23: warning: restricted __le32 degrades to integer
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1250:23: warning: restricted __le32 degrades to integer
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1250:23: warning: restricted __le32 degrades to integer
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1285:21: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1285:21: expected restricted __le32 [usertype] type
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1285:21: got unsigned int [unsigned] [usertype] reg_type
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1286:23: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1286:23: expected restricted __le32 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1286:23: got unsigned int [unsigned] [usertype] reg_offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1287:22: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1287:22: expected restricted __le32 [usertype] value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1287:22: got unsigned int [unsigned] [usertype] reg_value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1305:21: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1305:21: expected restricted __le32 [usertype] type
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1305:21: got unsigned int [unsigned] [usertype] reg_type
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1306:23: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1306:23: expected restricted __le32 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1306:23: got unsigned int [unsigned] [usertype] reg_offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1312:16: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1312:16: expected unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1312:16: got restricted __le32 [addressable] [usertype] value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1331:26: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1331:26: expected restricted __le16 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1331:26: got unsigned short [unsigned] [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1332:30: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1332:30: expected restricted __le16 [usertype] byte_count
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1332:30: got unsigned short [unsigned] [usertype] bytes
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:1339:48: error: incompatible types in comparison expression (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1133:35: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1134:34: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1144:35: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1145:35: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1155:34: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1156:34: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1166:36: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1167:36: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1177:35: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1178:35: warning: cast from restricted __le32
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1189:38: warning: cast from restricted __le16
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmd.c:1190:42: warning: cast from restricted __le16
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:784:32: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:784:32: expected restricted __le32 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:784:32: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:785:31: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:785:31: expected restricted __le32 [usertype] value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:785:31: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:789:32: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:789:32: expected restricted __le32 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:789:32: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:790:31: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:790:31: expected restricted __le32 [usertype] value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:790:31: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:795:32: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:795:32: expected restricted __le32 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:795:32: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:796:31: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:796:31: expected restricted __le32 [usertype] value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:796:31: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:800:32: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:800:32: expected restricted __le32 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:800:32: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:801:31: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:801:31: expected restricted __le32 [usertype] value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:801:31: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:805:32: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:805:32: expected restricted __le32 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:805:32: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:806:31: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:806:31: expected restricted __le32 [usertype] value
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:806:31: got unsigned int [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:812:27: warning: restricted __le16 degrades to integer
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:817:32: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:817:32: expected restricted __le16 [usertype] offset
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:817:32: got unsigned short [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:818:36: warning: incorrect type in assignment (different base types)
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:818:36: expected restricted __le16 [usertype] byte_count
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:818:36: got unsigned short [unsigned] [usertype] <noident>
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:819:27: warning: restricted __le16 degrades to integer
/home/amit/git.mwifiex-devel/mwifiex-devel/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c:821:32: error: incompatible types in comparison expression (different base types)
^ permalink raw reply
* linux-next: Tree for Jun 27
From: Stephen Rothwell @ 2016-06-27 6:39 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160624:
The nfs tree gained a build failure so I used the version from
next-20160624.
The net-next tree gained a conflict against the net tree.
The crypto tree lost its build failure.
The jc_docs tree gained a conflict against the drm tree.
The devicetree tree gained a conflict against the arm-soc tree.
The kvm-ppc-paulus tree gained a conflict against the powerpc tree.
Non-merge commits (relative to Linus' tree): 5593
5259 files changed, 236515 insertions(+), 104834 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 234 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (2ac9b9735b4d Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3)
Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (844e3be47693 powerpc/bpf/jit: Disable classic BPF JIT on ppc64le)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (c40e4096bf0a MAINTAINERS: Update Mellanox's mlx4 Eth NIC driver entry)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (370a8107e788 ipvs: fix bind to link-local mcast IPv6 address in backup)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel)
Merging sound-current/for-linus (d5dbbe656948 ALSA: dummy: Fix a use-after-free at closing)
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (33688abb2802 Linux 4.7-rc4)
Merging tty.current/tty-linus (5353ed8deede devpts: fix null pointer dereference on failed memory allocation)
Merging usb.current/usb-linus (7e8b3dfef163 USB: EHCI: declare hostpc register as zero-length array)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (df013212a1b6 Merge tag 'iio-fixes-for-4.7b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4)
Merging input-current/for-linus (60842ef8128e Input: vmmouse - remove port reservation)
Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (59461c018204 mfd: max77620: Fix FPS switch statements)
Merging drm-intel-fixes/for-linux-next-fixes (1e3fa0acfec6 drm/i915/fbc: Disable on HSW by default for now)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (5edb56491d48 Linux 4.7-rc3)
Merging arm/for-next (f07617e99523 Merge branches 'component', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (fcfe0c8bf1fc ARM: SoC: Document merges)
Merging amlogic/for-next (cc989c0bfd53 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (1a695a905c18 Linux 4.7-rc1)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (b2f6951491c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (56454a34f5d6 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (a68816dc4006 Merge branch 'omap-for-v4.8/soc' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (fe02b18c62d5 Merge branch 'arm64-for-4.8' into 4.8-all)
Merging renesas/next (334566aa6787 Merge branches 'heads/arm64-defconfig-for-v4.8', 'heads/arm64-dt-for-v4.8', 'heads/defconfig-for-v4.8', 'heads/dt-for-v4.8' and 'heads/soc-for-v4.8' into next)
Merging rockchip/for-next (6bc247858bb4 Merge branch 'v4.8-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (d054c56bd6a0 Merge branch 'next/soc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (5bcc7efc04c3 Merge branch for-4.8/arm64 into for-next)
Merging arm64/for-next/core (d770b5a04790 Revert "arm64: Add support ARCH_SUPPORTS_INT128")
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (9497a1c1c5b4 powerpc/powernv: Print correct PHB type names)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (63bf903583d7 Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL")
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (893d66192c46 tile: support gcc 7 optimization to use __multi3)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (5027553b087e Merge branch 'for-next-next-4.7-20160623' into for-next-20160623)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (45e8a2583d97 File names with trailing period or space need special case conversion)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (40f0fd372a62 ecryptfs: fix spelling mistakes)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (a2481adac819 f2fs: avoid latency-critical readahead of node pages)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (507c552aa58f fuse: improve aio directIO write performance for size extending writes)
Merging gfs2/for-next (1e875f5a95a2 gfs2: Initialize iopen glock holder for new inodes)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (b0a6c201b40a Merge branch 'writeback')
$ git reset --hard HEAD^
Merging next-20160624 version of nfs
Merging nfsd/nfsd-next (ee8f2a36a99c nfsd: allow nfsd to advertise multiple layout types)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (f920c41f047a ovl: move some common code in a function)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage())
Merging xfs/for-next (f477cedc4e79 Merge branch 'xfs-4.8-misc-fixes-2' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (68925197c96e Merge branch 'for-4.7/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d86a4c24d68e Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d4db8217f4b7 hwmon: (dell-smm) In debug mode log duration of SMM calls)
CONFLICT (content): Merge conflict in drivers/hwmon/dell-smm-hwmon.c
Merging v4l-dvb/master (2ed52999aaf3 Merge branch 'patchwork' into to_next)
Merging pm/linux-next (1231945e2e27 Merge branch 'acpi-pmic' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (73a14400c949 Merge branch 'topic/xilinx' into next)
Merging net-next/master (2b7c4f7a0ee7 Merge tag 'rxrpc-rewrite-20160622-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile
CONFLICT (content): Merge conflict in net/sched/sch_netem.c
CONFLICT (content): Merge conflict in net/rds/tcp_listen.c
CONFLICT (content): Merge conflict in net/rds/tcp_connect.c
CONFLICT (content): Merge conflict in drivers/net/vrf.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qed/qed_hsi.h
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (1bb57c8a5e33 Merge ath-next from ath.git)
Merging bluetooth/master (0e9390ebf1fe Merge branch 'mlxsw-next')
Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle')
Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8)
Merging rdma-leon/rdma-next (33688abb2802 Linux 4.7-rc4)
Merging rdma-leon-test/testing/rdma-next (33688abb2802 Linux 4.7-rc4)
Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings)
Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks)
Merging nand/nand/next (f5f2894f18af mtd: nand: sunxi: add reset line support)
Merging crypto/master (8f44df154de7 crypto: ecdh - make ecdh_shared_secret unique)
Merging drm/drm-next (2a3467063ae3 Merge tag 'mediatek-drm-2016-06-20' of git://git.pengutronix.de/git/pza/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c
Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback)
Merging drm-intel/for-linux-next (883445d43e45 drm/i915: Only switch to default context when evicting from GGTT)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
Merging drm-tegra/drm/tegra/for-next (575a892adaf7 gpu: host1x: Remove useless local variable)
Merging drm-misc/topic/drm-misc (8f76f5a01d1c drm/nouveau/dispnv04: Use helper to turn off CRTC)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (b7e7559f439c Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/dt-for-4.8' and 'sunxi/fixes-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (7e01dad0469b Merge branch 'kbuild/kbuild' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (20f0992c935f latent_entropy: Add the extra_latent_entropy kernel parameter)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (e568f95409ca Merge remote-tracking branches 'regmap/topic/i2c', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (3915bf294652 ALSA: seq_timer: use monotonic times internally)
Merging sound-asoc/for-next (bea297956778 Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/wm8731', 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (fcd6eb50eadd Input: add powerkey driver for HISI 65xx SoC)
Merging block/for-next (3cee5575153a Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in block/blk-lib.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (0fe0a864be7f Merge branch 'dm-4.7' into for-next)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (14c5283a54a5 mmc: sdhci: use pr_err for sdhci_dumpregs)
Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (1cf9326d4c07 mfd: max14577: Allow driver to be built as a module)
Merging backlight/for-backlight-next (4db8c9572ce1 backlight: lp855x: Add enable regulator)
Merging battery/master (2e05b518c897 power_supply: bq27xxx_battery: Group register mappings into one table)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (c4514259b173 Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi' and 'regulator/topic/twl' into regulator-next)
Merging security/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging integrity/next (848b134bf8e7 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (309c5fad5de4 selinux: fix type mismatch)
Merging tpmdd/next (7bca736708cd Merge branch 'master' into next)
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (8d16cf6b773d Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'arm/exynos' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (9698cbf0bea6 vfio: platform: support No-IOMMU mode)
Merging jc_docs/docs-next (17defc282fe6 Documentation: add meta-documentation for Sphinx and kernel-doc)
CONFLICT (content): Merge conflict in Documentation/index.rst
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (bba696c2c083 s390: ensure that syscall arguments are properly masked on s390)
CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c
Merging devicetree/for-next (15cc2ed6dcf9 of/irq: Mark initialised interrupt controllers as populated)
CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c
Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO)
Merging spi/for-next (bbe1fcc46cdc Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/rockchip', 'spi/topic/sh-msiof', 'spi/topic/sunxi' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (42f95e28e4e9 Merge branch 'x86/platform')
Merging clockevents/clockevents/next (3d802c5c8cfa Merge branches 'clockevents/clksrc-of-ret' and 'clockevents/compile-test' into clockevents/next)
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (bba142957e04 EDAC: Correct channel count limit)
Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (35a4495f637e rcu: Consolidate expedited grace period machinery)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Applying: rcu: merge fix for kernel/rcu/tree_exp.h
Merging kvm/linux-next (8ff7b956471f Merge tag 'kvm-s390-next-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
Merging kvms390/next (a411edf1320e KVM: s390: vsie: add module parameter "nested")
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (ab9bb11ccbaa dell-wmi: Add a WMI event code for display on/off)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (ea12c45f1b36 hsi: Only descend into hsi directory when CONFIG_HSI is set)
Merging leds/for-next (a8b8c8d67557 leds: Only descend into leds directory when CONFIG_NEW_LEDS is set)
Merging ipmi/for-next (4e80ad011c9c ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg())
Merging driver-core/driver-core-next (33688abb2802 Linux 4.7-rc4)
Merging tty/tty-next (98f2082c3ac4 tty/serial: atmel: enforce tasklet init and termination sequences)
Merging usb/usb-next (aa5e94a2e133 Revert "usb: ohci-at91: Forcibly suspend ports while USB suspend")
Merging usb-gadget/next (1d23d16a88e6 usb: gadget: pch_udc: reorder spin_[un]lock to avoid deadlock)
Merging usb-serial/usb-next (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-next/ci-for-usb-next (ebfad91c5da3 dt-bindings: ci-hdrc-usb2: s/gadget-itc-setting/itc-setting in example)
Merging staging/staging-next (b3e6916d6edf staging: wilc1000: fix return value check in wlan_initialize_threads())
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (e2402b1d214e nvmem: imx-ocotp: Fix assignment warning.)
Merging extcon/extcon-next (a05f44c89ee1 extcon: Check for incorrect connection type in notifier register)
Merging cgroup/for-next (1f22cd881c59 Merge branch 'for-4.7-fixes' into for-next)
Merging scsi/for-next (09aa8c2f3963 Merge branch 'misc' into for-next)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (da780c64d2b6 Merge branch 'for-4.7-fixes' into for-next)
Merging pinctrl/for-next (69fc8ca00b5d Merge branch 'devel' into for-next)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (ef583d362047 Merge branch 'rproc-next' into for-next)
Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (8910a6a600ee pwm: lpss: pci: Enable PWM module on Intel Edison)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
Merging userns/for-next (aad82892af26 selinux: Add support for unprivileged mounts from user namespaces)
CONFLICT (content): Merge conflict in fs/proc/root.c
Applying: proc: fixup for "prevent stacking filesystems on top"
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (367b30502d07 Merge remote-tracking branch 'clk/clk-s905' into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1a695a905c18 Linux 4.7-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (7c8cd269d93e coresight: Add better messages for coresight_timeout)
Merging rtc/rtc-next (0a553cbabd36 rtc: rtctest: Change no IRQ detection for RTC_IRQP_SET)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (36ac8116836c ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in ipc/sem.c
CONFLICT (content): Merge conflict in arch/arm64/mm/dma-mapping.c
CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree.
$ git rm -f arch/arm/configs/bcm_defconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Merging akpm/master (092ec523266f include/linux/bitmap.h: cleanup)
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Eric Dumazet @ 2016-06-27 4:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Eric Dumazet
In-Reply-To: <20160627114623.2c985be5@canb.auug.org.au>
On Mon, 2016-06-27 at 11:46 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/sch_netem.c
>
> between commit:
>
> 21de12ee5568 ("netem: fix a use after free")
>
> from the net tree and commit:
>
> 520ac30f4551 ("net_sched: drop packets after root qdisc lock is released")
>
> from the net-next 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.
>
Looks good, although the 'use after free' does not happen anymore on
net-next since we defer skb freeing.
I spotted the bug in stable tree when cooking the net-next patch
actually ;)
Thanks.
^ permalink raw reply
* linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree
From: Stephen Rothwell @ 2016-06-27 4:23 UTC (permalink / raw)
To: Paul Mackerras, Michael Ellerman, Benjamin Herrenschmidt,
linuxppc-dev
Cc: linux-next, linux-kernel, Mahesh Salgaonkar, Daniel Axtens
Hi Paul,
Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in:
arch/powerpc/kernel/traps.c
between commit:
42f5b4cacd78 ("powerpc: Introduce asm-prototypes.h")
from the powerpc tree and commit:
fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt")
from the kvm-ppc-paulus 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 arch/powerpc/kernel/traps.c
index f7e2f2e318bd,9ec95daccad9..000000000000
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@@ -60,7 -60,7 +60,8 @@@
#include <asm/switch_to.h>
#include <asm/tm.h>
#include <asm/debug.h>
+#include <asm/asm-prototypes.h>
+ #include <asm/hmi.h>
#include <sysdev/fsl_pci.h>
#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
^ permalink raw reply
* linux-next: manual merge of the devicetree tree with the arm-soc tree
From: Stephen Rothwell @ 2016-06-27 3:42 UTC (permalink / raw)
To: Rob Herring, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Chris Brand, Florian Fainelli,
Kefeng Wang
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm/mach-bcm/board_bcm21664.c
between commit:
406c8f6c9954 ("ARM: bcm21664: Remove reset code")
from the arm-soc tree and commit:
850bea2335e4 ("arm: Remove unnecessary of_platform_populate with default match table")
from the devicetree 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 arch/arm/mach-bcm/board_bcm21664.c
index 65b3db06e57a,0d7034c57334..000000000000
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@@ -11,15 -11,54 +11,12 @@@
* GNU General Public License for more details.
*/
- #include <linux/of_platform.h>
-#include <linux/of_address.h>
-#include <linux/io.h>
--
#include <asm/mach/arch.h>
#include "kona_l2_cache.h"
-#define RSTMGR_DT_STRING "brcm,bcm21664-resetmgr"
-
-#define RSTMGR_REG_WR_ACCESS_OFFSET 0
-#define RSTMGR_REG_CHIP_SOFT_RST_OFFSET 4
-
-#define RSTMGR_WR_PASSWORD 0xa5a5
-#define RSTMGR_WR_PASSWORD_SHIFT 8
-#define RSTMGR_WR_ACCESS_ENABLE 1
-
-static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
-{
- void __iomem *base;
- struct device_node *resetmgr;
-
- resetmgr = of_find_compatible_node(NULL, NULL, RSTMGR_DT_STRING);
- if (!resetmgr) {
- pr_emerg("Couldn't find " RSTMGR_DT_STRING "\n");
- return;
- }
- base = of_iomap(resetmgr, 0);
- if (!base) {
- pr_emerg("Couldn't map " RSTMGR_DT_STRING "\n");
- return;
- }
-
- /*
- * A soft reset is triggered by writing a 0 to bit 0 of the soft reset
- * register. To write to that register we must first write the password
- * and the enable bit in the write access enable register.
- */
- writel((RSTMGR_WR_PASSWORD << RSTMGR_WR_PASSWORD_SHIFT) |
- RSTMGR_WR_ACCESS_ENABLE,
- base + RSTMGR_REG_WR_ACCESS_OFFSET);
- writel(0, base + RSTMGR_REG_CHIP_SOFT_RST_OFFSET);
-
- /* Wait for reset */
- while (1);
-}
-
static void __init bcm21664_init(void)
{
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
kona_l2_cache_init();
}
^ permalink raw reply
* linux-next: manual merge of the jc_docs tree with the drm tree
From: Stephen Rothwell @ 2016-06-27 3:31 UTC (permalink / raw)
To: Jonathan Corbet, Dave Airlie
Cc: linux-next, linux-kernel, Jani Nikula, Daniel Vetter
Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/index.rst
between commit:
cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl")
from the drm tree and commit:
17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc")
from the jc_docs 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 Documentation/index.rst
index dacc77b43c29,f92854f01773..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -13,8 -13,8 +13,10 @@@ Contents
.. toctree::
:maxdepth: 2
+ kernel-documentation
+
+ gpu/index
+
Indices and tables
==================
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-06-27 1:46 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/sch_netem.c
between commit:
21de12ee5568 ("netem: fix a use after free")
from the net tree and commit:
520ac30f4551 ("net_sched: drop packets after root qdisc lock is released")
from the net-next 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 net/sched/sch_netem.c
index 178f1630a036,ccca8ca4c722..000000000000
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@@ -650,14 -617,17 +617,17 @@@ deliver
#endif
if (q->qdisc) {
+ unsigned int pkt_len = qdisc_pkt_len(skb);
- int err = qdisc_enqueue(skb, q->qdisc);
+ struct sk_buff *to_free = NULL;
+ int err;
+ err = qdisc_enqueue(skb, q->qdisc, &to_free);
+ kfree_skb_list(to_free);
- if (unlikely(err != NET_XMIT_SUCCESS)) {
- if (net_xmit_drop_count(err)) {
- qdisc_qstats_drop(sch);
- qdisc_tree_reduce_backlog(sch, 1,
- qdisc_pkt_len(skb));
- }
+ if (err != NET_XMIT_SUCCESS &&
+ net_xmit_drop_count(err)) {
+ qdisc_qstats_drop(sch);
+ qdisc_tree_reduce_backlog(sch, 1,
+ pkt_len);
}
goto tfifo_dequeue;
}
^ permalink raw reply
* linux-next: build failure after merge of the nfs tree
From: Stephen Rothwell @ 2016-06-27 0:58 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-next, linux-kernel
Hi Trond,
After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
fs/nfs/pnfs_nfs.c: In function 'pnfs_nfs_generic_sync':
fs/nfs/pnfs_nfs.c:947:8: error: too few arguments to function 'nfs_commit_inode'
ret = nfs_commit_inode(inode);
^
In file included from fs/nfs/pnfs_nfs.c:10:0:
include/linux/nfs_fs.h:509:13: note: declared here
extern int nfs_commit_inode(struct inode *, int);
^
Caused by commit
292cc573fce6 ("pNFS: Files and flexfiles always need to commit before layoutcommit")
I have used the nsf tree from next-20160624 for today
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: lots of repeated patches in the tpmdd tree
From: Stephen Rothwell @ 2016-06-26 23:36 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: linux-next, linux-kernel
Hi Jarkko,
I noticed that a large number of the patches in the tpmdd tree appear
twice (and some three times). They appear to have been rebased on top
of the security tree before being remerged. Please clean this all up.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* [PATCH -next] gpu: i915: fix build errors when ACPI is not enabled
From: Randy Dunlap @ 2016-06-25 17:58 UTC (permalink / raw)
To: LKML, linux-next@vger.kernel.org
Cc: Daniel Vetter, Jani Nikula, intel-gfx, dri-devel
From: Randy Dunlap <rdunlap@infradead.org>
Fix build errors when ACPI is not enabled by adding function stubs:
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
intel_opregion_unregister(dev_priv);
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
intel_opregion_register(dev_priv);
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
---
drivers/gpu/drm/i915/i915_drv.h | 2 ++
1 file changed, 2 insertions(+)
--- linux-next-20160624.orig/drivers/gpu/drm/i915/i915_drv.h
+++ linux-next-20160624/drivers/gpu/drm/i915/i915_drv.h
@@ -3694,6 +3694,8 @@ extern int intel_opregion_notify_adapter
extern int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv);
#else
static inline int intel_opregion_setup(struct drm_i915_private *dev) { return 0; }
+static inline void intel_opregion_register(struct drm_i915_private *dev_priv) { }
+static inline void intel_opregion_unregister(struct drm_i915_private *dev_priv) { }
static inline void intel_opregion_init(struct drm_i915_private *dev) { }
static inline void intel_opregion_fini(struct drm_i915_private *dev) { }
static inline void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
^ permalink raw reply
* Re: [PATCH 2/2] ipc/sem: sem_lock with hysteresis
From: Manfred Spraul @ 2016-06-25 17:37 UTC (permalink / raw)
To: Davidlohr Bueso
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Andrew Morton, LKML, linux-next, 1vier1, felixh
In-Reply-To: <20160621202902.GB3790@linux-80c1.suse>
On 06/21/2016 10:29 PM, Davidlohr Bueso wrote:
> On Sat, 18 Jun 2016, Manfred Spraul wrote:
>
>> sysv sem has two lock modes: One with per-semaphore locks, one lock mode
>> with a single big lock for the whole array.
>> When switching from the per-semaphore locks to the big lock, all
>> per-semaphore locks must be scanned for ongoing operations.
>>
>> The patch adds a hysteresis for switching from the big lock to the per
>> semaphore locks. This reduces how often the per-semaphore locks must
>> be scanned.
>
> Isn't this very arbitrary depending on the workload? Ie the other way
> around:
> when we have a lot more simple ops going on not so good. While I'm
> more worried
> about combinations that could cause enough complex ops to always delay
> taking
> the finer grained lock, this change also obviously makes simple ops
> more expensive
> on newly created segments.
I
Entering complex mode requires a scan of sem_base[].sem_lock.
> for (i = 0; i < sma->sem_nsems; i++) {
> sem = sma->sem_base + i;
> spin_unlock_wait(&sem->lock);
This is what the patch tries to avoid.
>
> In general I don't trust magic numbers much. What sort of numbers have
> you seen
> with this patch? Is this a real concern (particularly because a lot of
> the sem->lock
> work was because real world workloads were doing a lot more simple ops
> afaicr)?
>
With a microbenchmark: As much improvement as you want :-)
- Only simple ops: patch has no impact (the first 10 semops do not matter)
- sleeping complex ops: patch has no impact, we are always in complex mode
- not sleeping complex ops: depends on the size of the array.
With a 4.000 semaphore array, I see an improvement of factor 20.
There is obviously one case where the patch causes a slowdown:
- complex op, then 11 simple ops, then repeat.
Perhaps: set COMPLEX_MODE_ENTER to 1 or 2, then allow to configure it
from user space.
Or do not merge the patch and wait until someone come with a profile
that shows complexmode_enter().
--
Manfred
^ permalink raw reply
* Re: linux-next: manual merge of the audit tree with the security tree
From: Heiko Carstens @ 2016-06-25 7:28 UTC (permalink / raw)
To: Paul Moore
Cc: Stephen Rothwell, James Morris, linux-next, linux-kernel,
Kees Cook, Martin Schwidefsky
In-Reply-To: <CAHC9VhSKEEyfP7Gc_bsWbwn-TmjBFi3ATLCcx8VjYDSuBTVj5g@mail.gmail.com>
On Fri, Jun 24, 2016 at 12:20:52PM -0400, Paul Moore wrote:
> > I'm a bit concerned about user space pointers passed as argument for compat
> > tasks. These need to mask out 33 instead of 32 bits. This is of course
> > system call specific and I don't know enough about audit to tell if it
> > could be a problem.
>
> From a practical point of view I'm not sure how much of an impact that
> will have as it is unlikely anyone will be doing anything useful with
> those pointer values; for example, you aren't going to be inspecting a
> process' memory space using just the audit log. Also, at the very
> least we aren't removing any information, just adding in an extra bit
> of potential junk. Anyone who does care about user space pointers in
> the audit log, should have all the information the need to drop the
> high bit.
>
> Does that sound reasonable?
Yes, it does. If there should be problems because of the one extra bit that
potentially contains garbage we still can look for a way to fix this.
Thanks!
^ permalink raw reply
* mmotm 2016-06-24-15-53 uploaded
From: akpm @ 2016-06-24 22:53 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-06-24-15-53 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.7-rc4:
(patches marked "*" will be included in linux-next)
origin.patch
* mmoom_reaper-dont-call-mmput_async-without-atomic_inc_not_zero.patch
* oom_reaper-avoid-pointless-atomic_inc_not_zero-usage.patch
* selftests-vm-compaction_test-fix-write-to-restore-nr_hugepages.patch
* tmpfs-dont-undo-fallocate-past-its-last-page.patch
* tree-wide-get-rid-of-__gfp_repeat-for-order-0-allocations-part-i.patch
* x86-get-rid-of-superfluous-__gfp_repeat.patch
* x86-efi-get-rid-of-superfluous-__gfp_repeat.patch
* arm64-get-rid-of-superfluous-__gfp_repeat.patch
* arc-get-rid-of-superfluous-__gfp_repeat.patch
* mips-get-rid-of-superfluous-__gfp_repeat.patch
* nios2-get-rid-of-superfluous-__gfp_repeat.patch
* parisc-get-rid-of-superfluous-__gfp_repeat.patch
* score-get-rid-of-superfluous-__gfp_repeat.patch
* powerpc-get-rid-of-superfluous-__gfp_repeat.patch
* sparc-get-rid-of-superfluous-__gfp_repeat.patch
* s390-get-rid-of-superfluous-__gfp_repeat.patch
* sh-get-rid-of-superfluous-__gfp_repeat.patch
* tile-get-rid-of-superfluous-__gfp_repeat.patch
* unicore32-get-rid-of-superfluous-__gfp_repeat.patch
* jbd2-get-rid-of-superfluous-__gfp_repeat.patch
* maintainers-update-calgary-iommu.patch
* mm-mempool-kasan-dont-poot-mempool-objects-in-quarantine.patch
* mm-slaub-add-__gfp_atomic-to-the-gfp-reclaim-mask.patch
* mailmap-antoine-tenarts-email.patch
* mailmap-boris-brezillons-email.patch
* revert-mm-make-faultaround-produce-old-ptes.patch
* revert-mm-disable-fault-around-on-emulated-access-bit-architecture.patch
* hugetlb-fix-nr_pmds-accounting-with-shared-page-tables.patch
* memcg-mem_cgroup_migrate-may-be-called-with-irq-disabled.patch
* memcg-css_alloc-should-return-an-err_ptr-value-on-error.patch
* mm-swapc-flush-lru-pvecs-on-compound-page-arrival.patch
* mm-hugetlb-clear-compound_mapcount-when-freeing-gigantic-pages.patch
* mm-prevent-kasan-false-positives-in-kmemleak.patch
* mm-compaction-abort-free-scanner-if-split-fails.patch
* ocfs2-disable-bug-assertions-in-reading-blocks.patch
* oom-suspend-fix-oom_reaper-vs-oom_killer_disable-race.patch
* fs-nilfs2-fix-potential-underflow-in-call-to-crc32_le.patch
* tools-vm-slabinfo-fix-spelling-mistake-ocurrences-occurrences.patch
* mm-page_owner-use-stackdepot-to-store-stacktrace-fix.patch
* autofs-dont-stuck-in-a-loop-if-vfs_write-returns-an-error.patch
* init-mainc-fix-initcall_blacklisted-on-ia64-ppc64-and-parisc64.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* arm-get-rid-of-superfluous-__gfp_repeat.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* dax-use-devm_add_action_or_reset.patch
* scripts-bloat-o-meter-fix-percent-on-1%-changes.patch
* m32r-add-__ucmpdi2-to-fix-build-failure.patch
* debugobjectsh-fix-trivial-kernel-doc-warning.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-fix-a-redundant-re-initialization.patch
* ocfs2-improve-recovery-performance.patch
* ocfs2-cleanup-unneeded-goto-in-ocfs2_create_new_inode_locks.patch
* ocfs2-insure-dlm-lockspace-is-created-by-kernel-module.patch
* ocfs2-retry-on-enospc-if-sufficient-space-in-truncate-log.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* sb-add-a-new-writeback-list-for-sync.patch
* wb-inode-writeback-list-tracking-tracepoints.patch
mm.patch
* mm-reorganize-slab-freelist-randomization.patch
* mm-reorganize-slab-freelist-randomization-fix.patch
* mm-slub-freelist-randomization.patch
* slab-make-gfp_slab_bug_mask-information-more-human-readable.patch
* slab-do-not-panic-on-invalid-gfp_mask.patch
* mm-memcontrol-remove-the-useless-parameter-for-mc_handle_swap_pte.patch
* mm-init-fix-zone-boundary-creation.patch
* memory-hotplug-add-move_pfn_range.patch
* memory-hotplug-more-general-validation-of-zone-during-online.patch
* memory-hotplug-use-zone_can_shift-for-sysfs-valid_zones-attribute.patch
* mm-zap-zone_oom_locked.patch
* mm-oom-add-memcg-to-oom_control.patch
* mm-debug-add-vm_warn-which-maps-to-warn.patch
* powerpc-mm-check-for-irq-disabled-only-if-debug_vm-is-enabled.patch
* zram-rename-zstrm-find-release-functions.patch
* zram-switch-to-crypto-compress-api.patch
* zram-use-crypto-api-to-check-alg-availability.patch
* zram-use-crypto-api-to-check-alg-availability-v3.patch
* zram-cosmetic-cleanup-documentation.patch
* zram-delete-custom-lzo-lz4.patch
* zram-delete-custom-lzo-lz4-v3.patch
* zram-add-more-compression-algorithms.patch
* zram-add-more-compression-algorithms-v3.patch
* zram-drop-gfp_t-from-zcomp_strm_alloc.patch
* mm-use-put_page-to-free-page-instead-of-putback_lru_page.patch
* mm-migrate-support-non-lru-movable-page-migration.patch
* mm-migrate-support-non-lru-movable-page-migration-fix.patch
* mm-balloon-use-general-non-lru-movable-page-feature.patch
* mm-balloon-use-general-non-lru-movable-page-feature-fix.patch
* zsmalloc-keep-max_object-in-size_class.patch
* zsmalloc-use-bit_spin_lock.patch
* zsmalloc-use-accessor.patch
* zsmalloc-factor-page-chain-functionality-out.patch
* zsmalloc-introduce-zspage-structure.patch
* zsmalloc-separate-free_zspage-from-putback_zspage.patch
* zsmalloc-use-freeobj-for-index.patch
* zsmalloc-page-migration-support.patch
* zsmalloc-page-migration-support-fix.patch
* zsmalloc-page-migration-support-fix-2.patch
* zram-use-__gfp_movable-for-memory-allocation.patch
* zsmalloc-use-obj_tag_bit-for-bit-shifter.patch
* mm-compaction-split-freepages-without-holding-the-zone-lock.patch
* mm-compaction-split-freepages-without-holding-the-zone-lock-fix.patch
* mm-compaction-split-freepages-without-holding-the-zone-lock-fix-2.patch
* mm-page_owner-initialize-page-owner-without-holding-the-zone-lock.patch
* mm-page_owner-copy-last_migrate_reason-in-copy_page_owner.patch
* mm-page_owner-introduce-split_page_owner-and-replace-manual-handling.patch
* tools-vm-page_owner-increase-temporary-buffer-size.patch
* mm-page_owner-use-stackdepot-to-store-stacktrace.patch
* mm-page_alloc-introduce-post-allocation-processing-on-page-allocator.patch
* mm-thp-check-pmd_trans_unstable-after-split_huge_pmd.patch
* mm-hugetlb-simplify-hugetlb-unmap.patch
* mm-change-the-interface-for-__tlb_remove_page.patch
* mm-change-the-interface-for-__tlb_remove_page-v3.patch
* mm-mmu_gather-track-page-size-with-mmu-gather-and-force-flush-if-page-size-change.patch
* mm-remove-pointless-struct-in-struct-page-definition.patch
* mm-clean-up-non-standard-page-_mapcount-users.patch
* mm-memcontrol-cleanup-kmem-charge-functions.patch
* mm-charge-uncharge-kmemcg-from-generic-page-allocator-paths.patch
* mm-memcontrol-teach-uncharge_list-to-deal-with-kmem-pages.patch
* arch-x86-charge-page-tables-to-kmemcg.patch
* pipe-account-to-kmemcg.patch
* af_unix-charge-buffers-to-kmemcg.patch
* mmoom-remove-unused-argument-from-oom_scan_process_thread.patch
* mm-frontswap-convert-frontswap_enabled-to-static-key.patch
* mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch
* mm-add-nr_zsmalloc-to-vmstat.patch
* mm-add-nr_zsmalloc-to-vmstat-fix.patch
* mm-add-nr_zsmalloc-to-vmstat-fix-2.patch
* include-linux-memblockh-clean-up-code-for-several-trivial-details.patch
* mm-oom_reaper-make-sure-that-mmput_async-is-called-only-when-memory-was-reaped.patch
* mm-memcg-use-consistent-gfp-flags-during-readahead.patch
* mm-memcg-use-consistent-gfp-flags-during-readahead-fix.patch
* mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-3.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-4.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-ks.patch
* mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix.patch
* mm-thp-fix-locking-inconsistency-in-collapse_huge_page.patch
* mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch
* khugepaged-recheck-pmd-after-mmap_sem-re-acquired.patch
* thp-mlock-update-unevictable-lrutxt.patch
* mm-do-not-pass-mm_struct-into-handle_mm_fault.patch
* mm-introduce-fault_env.patch
* mm-postpone-page-table-allocation-until-we-have-page-to-map.patch
* rmap-support-file-thp.patch
* mm-introduce-do_set_pmd.patch
* thp-vmstats-add-counters-for-huge-file-pages.patch
* thp-support-file-pages-in-zap_huge_pmd.patch
* thp-handle-file-pages-in-split_huge_pmd.patch
* thp-handle-file-cow-faults.patch
* thp-skip-file-huge-pmd-on-copy_huge_pmd.patch
* thp-prepare-change_huge_pmd-for-file-thp.patch
* thp-run-vma_adjust_trans_huge-outside-i_mmap_rwsem.patch
* thp-file-pages-support-for-split_huge_page.patch
* thp-mlock-do-not-mlock-pte-mapped-file-huge-pages.patch
* vmscan-split-file-huge-pages-before-paging-them-out.patch
* page-flags-relax-policy-for-pg_mappedtodisk-and-pg_reclaim.patch
* radix-tree-implement-radix_tree_maybe_preload_order.patch
* filemap-prepare-find-and-delete-operations-for-huge-pages.patch
* truncate-handle-file-thp.patch
* mm-rmap-account-shmem-thp-pages.patch
* shmem-prepare-huge=-mount-option-and-sysfs-knob.patch
* shmem-get_unmapped_area-align-huge-page.patch
* shmem-add-huge-pages-support.patch
* shmem-thp-respect-madv_nohugepage-for-file-mappings.patch
* thp-extract-khugepaged-from-mm-huge_memoryc.patch
* khugepaged-move-up_readmmap_sem-out-of-khugepaged_alloc_page.patch
* shmem-make-shmem_inode_info-lock-irq-safe.patch
* khugepaged-add-support-of-collapse-for-tmpfs-shmem-pages.patch
* thp-introduce-config_transparent_huge_pagecache.patch
* shmem-split-huge-pages-beyond-i_size-under-memory-pressure.patch
* thp-update-documentation-vm-transhugefilesystems-proctxt.patch
* mm-zsmalloc-add-trace-events-for-zs_compact.patch
* mm-fix-build-warnings-in-linux-compactionh.patch
* mm-fix-build-warnings-in-linux-compactionh-fix.patch
* mm-memcontrol-remove-bug_on-in-uncharge_list.patch
* mm-memcontrol-fix-documentation-for-compound-parameter.patch
* cgroup-fix-idr-leak-for-the-first-cgroup-root.patch
* cgroup-remove-unnecessary-0-check-from-css_from_id.patch
* mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs.patch
* mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs-fix.patch
* thp-fix-comments-of-__pmd_trans_huge_lock.patch
* proc-oom-drop-bogus-task_lock-and-mm-check.patch
* proc-oom-drop-bogus-sighand-lock.patch
* proc-oom_adj-extract-oom_score_adj-setting-into-a-helper.patch
* mm-oom_adj-make-sure-processes-sharing-mm-have-same-view-of-oom_score_adj.patch
* mm-oom-skip-vforked-tasks-from-being-selected.patch
* mm-oom-kill-all-tasks-sharing-the-mm.patch
* mm-oom-fortify-task_will_free_mem.patch
* mm-oom-task_will_free_mem-should-skip-oom_reaped-tasks.patch
* mm-oom_reaper-do-not-attempt-to-reap-a-task-more-than-twice.patch
* mm-oom-hide-mm-which-is-shared-with-kthread-or-global-init.patch
* mm-update-the-comment-in-__isolate_free_page.patch
* mm-update-the-comment-in-__isolate_free_page-checkpatch-fixes.patch
* ksm-set-anon_vma-of-first-rmap_item-of-ksm-page-to-pages-anon_vma-other-than-vmas-anon_vma.patch
* mm-fix-vm-scalability-regression-in-cgroup-aware-workingset-code.patch
* mm-compaction-remove-unnecessary-order-check-in-try_to_compact_pages.patch
* mm-kasan-switch-slub-to-stackdepot-enable-memory-quarantine-for-slub.patch
* proc_oom_score-remove-tasklist_lock-and-pid_alive.patch
* procfs-avoid-32-bit-time_t-in-proc-stat.patch
* make-compile_test-depend-on-uml.patch
* memstick-dont-allocate-unused-major-for-ms_block.patch
* nvme-dont-allocate-unused-nvme_major.patch
* nvme-dont-allocate-unused-nvme_major-fix.patch
* treewide-replace-obsolete-_refok-by-__ref.patch
* treewide-replace-obsolete-_refok-by-__ref-checkpatch-fixes.patch
* task_work-use-read_once-lockless_dereference-avoid-pi_lock-if-task_works.patch
* printk-do-not-include-interrupth.patch
* printk-create-pr_level-functions.patch
* printk-create-pr_level-functions-fix.patch
* printk-introduce-should_ignore_loglevel.patch
* lib-switch-config_printk_time-to-int.patch
* printk-allow-different-timestamps-for-printktime.patch
* lib-iommu-helper-skip-to-next-segment.patch
* crc32-use-ktime_get_ns-for-measurement.patch
* lib-add-crc64-ecma-module.patch
* compat-remove-compat_printk.patch
* firmware-consolidate-kmap-read-write-logic.patch
* firmware-provide-infrastructure-to-make-fw-caching-optional.patch
* firmware-support-loading-into-a-pre-allocated-buffer.patch
* firmware-support-loading-into-a-pre-allocated-buffer-fix.patch
* samples-kprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-jprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-kretprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-kretprobe-fix-the-wrong-type.patch
* fs-befs-move-useless-assignment.patch
* fs-befs-check-silent-flag-before-logging-errors.patch
* fs-befs-remove-useless-pr_err.patch
* fs-befs-remove-useless-befs_error.patch
* fs-befs-remove-useless-pr_err-in-befs_init_inodecache.patch
* befs-check-return-of-sb_min_blocksize.patch
* befs-fix-function-name-in-documentation.patch
* befs-remove-unused-functions.patch
* fs-befs-replace-befs_bread-by-sb_bread.patch
* nilfs2-hide-function-name-argument-from-nilfs_error.patch
* nilfs2-add-nilfs_msg-message-interface.patch
* nilfs2-embed-a-back-pointer-to-super-block-instance-in-nilfs-object.patch
* nilfs2-reduce-bare-use-of-printk-with-nilfs_msg.patch
* nilfs2-replace-nilfs_warning-with-nilfs_msg.patch
* nilfs2-replace-nilfs_warning-with-nilfs_msg-fix.patch
* nilfs2-emit-error-message-when-i-o-error-is-detected.patch
* nilfs2-do-not-use-yield.patch
* nilfs2-refactor-parser-of-snapshot-mount-option.patch
* nilfs2-fix-misuse-of-a-semaphore-in-sysfs-code.patch
* nilfs2-use-bit-macro.patch
* nilfs2-move-ioctl-interface-and-disk-layout-to-uapi-separately.patch
* reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch
* cpumask-fix-code-comment.patch
* kexec-return-error-number-directly.patch
* arm-kdump-advertise-boot-aliased-crash-kernel-resource.patch
* arm-kexec-advertise-location-of-bootable-ram.patch
* kexec-dont-invoke-oom-killer-for-control-page-allocation.patch
* kexec-ensure-user-memory-sizes-do-not-wrap.patch
* kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch
* kdump-arrange-for-paddr_vmcoreinfo_note-to-return-phys_addr_t.patch
* kexec-allow-architectures-to-override-boot-mapping.patch
* kexec-allow-architectures-to-override-boot-mapping-fix.patch
* arm-keystone-dts-add-psci-command-definition.patch
* arm-kexec-fix-kexec-for-keystone-2.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* futex-fix-shared-futex-operations-on-nommu.patch
* dma-mapping-constify-attrs-passed-to-dma_get_attr.patch
* arm-dma-mapping-constify-attrs-passed-to-internal-functions.patch
* arm64-dma-mapping-constify-attrs-passed-to-internal-functions.patch
* w1-remove-need-for-ida-and-use-platform_devid_auto.patch
* w1-add-helper-macro-module_w1_family.patch
* init-allow-blacklisting-of-module_init-functions.patch
* kcov-allow-more-fine-grained-coverage-instrumentation.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-sem-sem_lock-with-hysteresis.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* fpga-zynq-fpga-fix-build-failure.patch
* tree-wide-replace-config_enabled-with-is_enabled.patch
* bitmap-bitmap_equal-memcmp-optimization-fix.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* Re: linux-next: manual merge of the audit tree with the security tree
From: Paul Moore @ 2016-06-24 16:20 UTC (permalink / raw)
To: Heiko Carstens
Cc: Stephen Rothwell, James Morris, linux-next, linux-kernel,
Kees Cook, Martin Schwidefsky
In-Reply-To: <20160624152046.GB3940@osiris>
On Fri, Jun 24, 2016 at 11:20 AM, Heiko Carstens
<heiko.carstens@de.ibm.com> wrote:
> On Fri, Jun 24, 2016 at 11:05:33AM -0400, Paul Moore wrote:
>> My immediate concern is making sure that we are at least recording the
>> arguments correctly in the audit record. My simple tests look okay,
>> but as I said before, I'm far from a s390 expert and your initial
>> comment made it sound like there were still problems with how we were
>> recording the arguments. Can you either confirm that we are logging
>> the arguments correctly, or provide a suggestion on how to get the
>> right values? That would be most helpful at this point.
>
> The arguments are correct, except that they are missing sign and zero
> extension to full 64 bit. However I would expect that the audit subsystem
> will only work on the lower 32 bits anyway for compat tasks. So that
> shouldn't be a problem.
Yes, that should be fine. We were seeing problems with s390 syscalls
on s390x showing garbage in the high 32-bits, that's the problem I'm
trying to solve.
For example, here is a snippet of an audit record generated from
calling the s390 socketcall() on a s390x system:
type=SYSCALL msg=audit(1458835510.860:652): arch=16 syscall=102
success=yes exit=21
a0=ffffffff0000000b
a1=3ff7f82e3c0
a2=3ff00000000
a3=a72028
> I'm a bit concerned about user space pointers passed as argument for compat
> tasks. These need to mask out 33 instead of 32 bits. This is of course
> system call specific and I don't know enough about audit to tell if it
> could be a problem.
>From a practical point of view I'm not sure how much of an impact that
will have as it is unlikely anyone will be doing anything useful with
those pointer values; for example, you aren't going to be inspecting a
process' memory space using just the audit log. Also, at the very
least we aren't removing any information, just adding in an extra bit
of potential junk. Anyone who does care about user space pointers in
the audit log, should have all the information the need to drop the
high bit.
Does that sound reasonable?
--
paul moore
www.paul-moore.com
^ 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