Re: linux-next: manual merge of the staging tree with Linus' tree

2020-07-20 Thread Greg KH 
On Mon, Jul 20, 2020 at 03:25:22PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/iio/magnetometer/ak8974.c
> 
> between commit:
> 
>   0187294d227d ("iio: magnetometer: ak8974: Fix runtime PM imbalance on 
> error")
> 
> from Linus' tree and commit:
> 
>   d3be83244c7d ("iio: remove explicit IIO device parent assignment")
> 
> from the staging 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 drivers/iio/magnetometer/ak8974.c
> index 91c39352fba2,c2260c84f7f1..
> --- a/drivers/iio/magnetometer/ak8974.c
> +++ b/drivers/iio/magnetometer/ak8974.c
> @@@ -890,10 -884,14 +890,9 @@@ static int ak8974_probe(struct i2c_clie
>   ret = ak8974_reset(ak8974);
>   if (ret) {
>   dev_err(>dev, "AK8974 reset failed\n");
>  -goto power_off;
>  +goto disable_pm;
>   }
>   
> - indio_dev->dev.parent = >dev;
>  -pm_runtime_set_autosuspend_delay(>dev,
>  - AK8974_AUTOSUSPEND_DELAY);
>  -pm_runtime_use_autosuspend(>dev);
>  -pm_runtime_put(>dev);
>  -
>   switch (ak8974->variant) {
>   case AK8974_WHOAMI_VALUE_AMI306:
>   case AK8974_WHOAMI_VALUE_AMI305:



Looks good to me, thanks, I've now done this same thing to my tree as I
have merged with v5.8-rc6.

thanks,

greg k-h

linux-next: manual merge of the staging tree with Linus' tree

2020-07-19 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/iio/magnetometer/ak8974.c

between commit:

  0187294d227d ("iio: magnetometer: ak8974: Fix runtime PM imbalance on error")

from Linus' tree and commit:

  d3be83244c7d ("iio: remove explicit IIO device parent assignment")

from the staging 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 drivers/iio/magnetometer/ak8974.c
index 91c39352fba2,c2260c84f7f1..
--- a/drivers/iio/magnetometer/ak8974.c
+++ b/drivers/iio/magnetometer/ak8974.c
@@@ -890,10 -884,14 +890,9 @@@ static int ak8974_probe(struct i2c_clie
ret = ak8974_reset(ak8974);
if (ret) {
dev_err(>dev, "AK8974 reset failed\n");
 -  goto power_off;
 +  goto disable_pm;
}
  
-   indio_dev->dev.parent = >dev;
 -  pm_runtime_set_autosuspend_delay(>dev,
 -   AK8974_AUTOSUSPEND_DELAY);
 -  pm_runtime_use_autosuspend(>dev);
 -  pm_runtime_put(>dev);
 -
switch (ak8974->variant) {
case AK8974_WHOAMI_VALUE_AMI306:
case AK8974_WHOAMI_VALUE_AMI305:


pgp0GC1BrwhTB.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Greg KH 
On Wed, Jun 06, 2018 at 07:12:05PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/ipx/af_ipx.c
>   drivers/staging/ipx/ipx_proc.c
> 
> between commits:
> 
>   fddda2b7b521 ("proc: introduce proc_create_seq{,_data}")
>   db5051ead64a ("net: convert datagram_poll users tp ->poll_mask")
> 
> from Linus' tree and commit:
> 
>   7a2e838d28cf ("staging: ipx: delete it from the tree")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the files) 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.

Thanks, those files should just be removed.

greg k-h

Re: linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Greg KH 
On Wed, Jun 06, 2018 at 07:12:05PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/ipx/af_ipx.c
>   drivers/staging/ipx/ipx_proc.c
> 
> between commits:
> 
>   fddda2b7b521 ("proc: introduce proc_create_seq{,_data}")
>   db5051ead64a ("net: convert datagram_poll users tp ->poll_mask")
> 
> from Linus' tree and commit:
> 
>   7a2e838d28cf ("staging: ipx: delete it from the tree")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the files) 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.

Thanks, those files should just be removed.

greg k-h

linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/ipx/af_ipx.c
  drivers/staging/ipx/ipx_proc.c

between commits:

  fddda2b7b521 ("proc: introduce proc_create_seq{,_data}")
  db5051ead64a ("net: convert datagram_poll users tp ->poll_mask")

from Linus' tree and commit:

  7a2e838d28cf ("staging: ipx: delete it from the tree")

from the staging tree.

I fixed it up (I just removed the files) 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


pgplNxe5jLOlY.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/ipx/af_ipx.c
  drivers/staging/ipx/ipx_proc.c

between commits:

  fddda2b7b521 ("proc: introduce proc_create_seq{,_data}")
  db5051ead64a ("net: convert datagram_poll users tp ->poll_mask")

from Linus' tree and commit:

  7a2e838d28cf ("staging: ipx: delete it from the tree")

from the staging tree.

I fixed it up (I just removed the files) 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


pgplNxe5jLOlY.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Greg KH 
On Wed, Jun 06, 2018 at 07:08:58PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/ncpfs/dir.c
> 
> between commit:
> 
>   1c5fedbb508f ("ncp_lookup(): use d_splice_alias()")
> 
> from Linus' tree and commit:
> 
>   bd32895c750b ("staging: ncpfs: delete it")
> 
> from the staging tree.
> 
> I fixed it up (the latter removed the file, so I did that) 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.

Thanks, I figured this would show up, not a problem, the file should be
just removed.

greg k-h

Re: linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Greg KH 
On Wed, Jun 06, 2018 at 07:08:58PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/ncpfs/dir.c
> 
> between commit:
> 
>   1c5fedbb508f ("ncp_lookup(): use d_splice_alias()")
> 
> from Linus' tree and commit:
> 
>   bd32895c750b ("staging: ncpfs: delete it")
> 
> from the staging tree.
> 
> I fixed it up (the latter removed the file, so I did that) 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.

Thanks, I figured this would show up, not a problem, the file should be
just removed.

greg k-h

linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/ncpfs/dir.c

between commit:

  1c5fedbb508f ("ncp_lookup(): use d_splice_alias()")

from Linus' tree and commit:

  bd32895c750b ("staging: ncpfs: delete it")

from the staging tree.

I fixed it up (the latter removed the file, so I did that) 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


pgpcu1jXl5iyw.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the staging tree with Linus' tree

2018-06-06 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/ncpfs/dir.c

between commit:

  1c5fedbb508f ("ncp_lookup(): use d_splice_alias()")

from Linus' tree and commit:

  bd32895c750b ("staging: ncpfs: delete it")

from the staging tree.

I fixed it up (the latter removed the file, so I did that) 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


pgpcu1jXl5iyw.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the staging tree with Linus' tree

2018-02-23 Thread Greg KH 
On Fri, Feb 23, 2018 at 01:28:36PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/fsl-mc/bus/Kconfig
> 
> between commit:
> 
>   02b7b2844c2f ("staging: fsl-mc: fix build testing on x86")
> 
> from Linus' tree and commit:
> 
>   6bd067c48efe ("staging: fsl-mc: Move core bus out of staging")
> 
> from the staging tree.
> 
> I fixed it up (I used the latter version of that file and applied the
> followinf merge fix patch) 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.
> 
> From: Stephen Rothwell 
> Date: Fri, 23 Feb 2018 13:25:34 +1100
> Subject: [PATCH] staging: fsl-mc: merge fix for CONFIG_FSL_MC_BUS moving
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/bus/fsl-mc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/fsl-mc/Kconfig b/drivers/bus/fsl-mc/Kconfig
> index bcca64486fd3..c23c77c9b705 100644
> --- a/drivers/bus/fsl-mc/Kconfig
> +++ b/drivers/bus/fsl-mc/Kconfig
> @@ -7,7 +7,7 @@
>  
>  config FSL_MC_BUS
>   bool "QorIQ DPAA2 fsl-mc bus driver"
> - depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
> X86 || PPC)))
> + depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
> X86_LOCAL_APIC || PPC)))
>   select GENERIC_MSI_IRQ_DOMAIN
>   help
> Driver to enable the bus infrastructure for the QorIQ DPAA2
> -- 
> 2.16.1

Thanks for this, I'll fix it up after 4.16-rc3 is out.

greg k-h

Re: linux-next: manual merge of the staging tree with Linus' tree

2018-02-23 Thread Greg KH 
On Fri, Feb 23, 2018 at 01:28:36PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/fsl-mc/bus/Kconfig
> 
> between commit:
> 
>   02b7b2844c2f ("staging: fsl-mc: fix build testing on x86")
> 
> from Linus' tree and commit:
> 
>   6bd067c48efe ("staging: fsl-mc: Move core bus out of staging")
> 
> from the staging tree.
> 
> I fixed it up (I used the latter version of that file and applied the
> followinf merge fix patch) 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.
> 
> From: Stephen Rothwell 
> Date: Fri, 23 Feb 2018 13:25:34 +1100
> Subject: [PATCH] staging: fsl-mc: merge fix for CONFIG_FSL_MC_BUS moving
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/bus/fsl-mc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/fsl-mc/Kconfig b/drivers/bus/fsl-mc/Kconfig
> index bcca64486fd3..c23c77c9b705 100644
> --- a/drivers/bus/fsl-mc/Kconfig
> +++ b/drivers/bus/fsl-mc/Kconfig
> @@ -7,7 +7,7 @@
>  
>  config FSL_MC_BUS
>   bool "QorIQ DPAA2 fsl-mc bus driver"
> - depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
> X86 || PPC)))
> + depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
> X86_LOCAL_APIC || PPC)))
>   select GENERIC_MSI_IRQ_DOMAIN
>   help
> Driver to enable the bus infrastructure for the QorIQ DPAA2
> -- 
> 2.16.1

Thanks for this, I'll fix it up after 4.16-rc3 is out.

greg k-h

linux-next: manual merge of the staging tree with Linus' tree

2018-02-22 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/fsl-mc/bus/Kconfig

between commit:

  02b7b2844c2f ("staging: fsl-mc: fix build testing on x86")

from Linus' tree and commit:

  6bd067c48efe ("staging: fsl-mc: Move core bus out of staging")

from the staging tree.

I fixed it up (I used the latter version of that file and applied the
followinf merge fix patch) 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.

From: Stephen Rothwell 
Date: Fri, 23 Feb 2018 13:25:34 +1100
Subject: [PATCH] staging: fsl-mc: merge fix for CONFIG_FSL_MC_BUS moving

Signed-off-by: Stephen Rothwell 
---
 drivers/bus/fsl-mc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/Kconfig b/drivers/bus/fsl-mc/Kconfig
index bcca64486fd3..c23c77c9b705 100644
--- a/drivers/bus/fsl-mc/Kconfig
+++ b/drivers/bus/fsl-mc/Kconfig
@@ -7,7 +7,7 @@
 
 config FSL_MC_BUS
bool "QorIQ DPAA2 fsl-mc bus driver"
-   depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
X86 || PPC)))
+   depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
X86_LOCAL_APIC || PPC)))
select GENERIC_MSI_IRQ_DOMAIN
help
  Driver to enable the bus infrastructure for the QorIQ DPAA2
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell


pgpFWXV1lYy7d.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the staging tree with Linus' tree

2018-02-22 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/fsl-mc/bus/Kconfig

between commit:

  02b7b2844c2f ("staging: fsl-mc: fix build testing on x86")

from Linus' tree and commit:

  6bd067c48efe ("staging: fsl-mc: Move core bus out of staging")

from the staging tree.

I fixed it up (I used the latter version of that file and applied the
followinf merge fix patch) 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.

From: Stephen Rothwell 
Date: Fri, 23 Feb 2018 13:25:34 +1100
Subject: [PATCH] staging: fsl-mc: merge fix for CONFIG_FSL_MC_BUS moving

Signed-off-by: Stephen Rothwell 
---
 drivers/bus/fsl-mc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/Kconfig b/drivers/bus/fsl-mc/Kconfig
index bcca64486fd3..c23c77c9b705 100644
--- a/drivers/bus/fsl-mc/Kconfig
+++ b/drivers/bus/fsl-mc/Kconfig
@@ -7,7 +7,7 @@
 
 config FSL_MC_BUS
bool "QorIQ DPAA2 fsl-mc bus driver"
-   depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
X86 || PPC)))
+   depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || 
X86_LOCAL_APIC || PPC)))
select GENERIC_MSI_IRQ_DOMAIN
help
  Driver to enable the bus infrastructure for the QorIQ DPAA2
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell


pgpFWXV1lYy7d.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the staging tree with Linus' tree

2016-04-11 Thread Greg KH 
On Tue, Apr 05, 2016 at 01:49:27PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/lustre/lnet/selftest/brw_test.c
>   drivers/staging/lustre/lustre/include/lu_object.h
>   drivers/staging/lustre/lustre/lclient/lcommon_cl.c
>   drivers/staging/lustre/lustre/llite/llite_internal.h
>   drivers/staging/lustre/lustre/llite/llite_lib.c
>   drivers/staging/lustre/lustre/llite/llite_mmap.c
>   drivers/staging/lustre/lustre/llite/rw.c
>   drivers/staging/lustre/lustre/llite/rw26.c
>   drivers/staging/lustre/lustre/llite/vvp_io.c
>   drivers/staging/lustre/lustre/llite/vvp_page.c
>   drivers/staging/lustre/lustre/obdclass/class_obd.c
>   drivers/staging/lustre/lustre/obdecho/echo_client.c
>   drivers/staging/lustre/lustre/osc/lproc_osc.c
>   drivers/staging/lustre/lustre/osc/osc_cache.c
>   drivers/staging/lustre/lustre/osc/osc_page.c
>   drivers/staging/lustre/lustre/osc/osc_request.c
> 
> between commits:
> 
>   09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} 
> macros")
>   ea1754a08476 ("mm, fs: remove remaining PAGE_CACHE_* and 
> page_cache_{get,release} usage")
> 
> from Linus' tree and lots of commits from the staging tree.
> 
> I fixed it up (see below the signature) 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.
> 
> I also added this merge fix patch:

Thanks for this, it should all now be resolved in my tree.

greg k-h

Re: linux-next: manual merge of the staging tree with Linus' tree

2016-04-11 Thread Greg KH 
On Tue, Apr 05, 2016 at 01:49:27PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/lustre/lnet/selftest/brw_test.c
>   drivers/staging/lustre/lustre/include/lu_object.h
>   drivers/staging/lustre/lustre/lclient/lcommon_cl.c
>   drivers/staging/lustre/lustre/llite/llite_internal.h
>   drivers/staging/lustre/lustre/llite/llite_lib.c
>   drivers/staging/lustre/lustre/llite/llite_mmap.c
>   drivers/staging/lustre/lustre/llite/rw.c
>   drivers/staging/lustre/lustre/llite/rw26.c
>   drivers/staging/lustre/lustre/llite/vvp_io.c
>   drivers/staging/lustre/lustre/llite/vvp_page.c
>   drivers/staging/lustre/lustre/obdclass/class_obd.c
>   drivers/staging/lustre/lustre/obdecho/echo_client.c
>   drivers/staging/lustre/lustre/osc/lproc_osc.c
>   drivers/staging/lustre/lustre/osc/osc_cache.c
>   drivers/staging/lustre/lustre/osc/osc_page.c
>   drivers/staging/lustre/lustre/osc/osc_request.c
> 
> between commits:
> 
>   09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} 
> macros")
>   ea1754a08476 ("mm, fs: remove remaining PAGE_CACHE_* and 
> page_cache_{get,release} usage")
> 
> from Linus' tree and lots of commits from the staging tree.
> 
> I fixed it up (see below the signature) 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.
> 
> I also added this merge fix patch:

Thanks for this, it should all now be resolved in my tree.

greg k-h

linux-next: manual merge of the staging tree with Linus' tree

2016-04-04 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/lustre/lnet/selftest/brw_test.c
  drivers/staging/lustre/lustre/include/lu_object.h
  drivers/staging/lustre/lustre/lclient/lcommon_cl.c
  drivers/staging/lustre/lustre/llite/llite_internal.h
  drivers/staging/lustre/lustre/llite/llite_lib.c
  drivers/staging/lustre/lustre/llite/llite_mmap.c
  drivers/staging/lustre/lustre/llite/rw.c
  drivers/staging/lustre/lustre/llite/rw26.c
  drivers/staging/lustre/lustre/llite/vvp_io.c
  drivers/staging/lustre/lustre/llite/vvp_page.c
  drivers/staging/lustre/lustre/obdclass/class_obd.c
  drivers/staging/lustre/lustre/obdecho/echo_client.c
  drivers/staging/lustre/lustre/osc/lproc_osc.c
  drivers/staging/lustre/lustre/osc/osc_cache.c
  drivers/staging/lustre/lustre/osc/osc_page.c
  drivers/staging/lustre/lustre/osc/osc_request.c

between commits:

  09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} 
macros")
  ea1754a08476 ("mm, fs: remove remaining PAGE_CACHE_* and 
page_cache_{get,release} usage")

from Linus' tree and lots of commits from the staging tree.

I fixed it up (see below the signature) 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.

I also added this merge fix patch:

From: Stephen Rothwell 
Date: Tue, 5 Apr 2016 13:38:19 +1000
Subject: [PATCH] lustre: fix ups for PAGE_CACHE_... removal

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h | 2 +-
 drivers/staging/lustre/lustre/llite/vvp_dev.c | 4 ++--
 drivers/staging/lustre/lustre/lov/lov_offset.c| 4 ++--
 drivers/staging/lustre/lustre/lov/lov_page.c  | 2 +-
 drivers/staging/lustre/lustre/osc/osc_io.c| 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h 
b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
index 6f7a276b87b7..ac4e8cfe6c8c 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
@@ -46,7 +46,7 @@
 #if BITS_PER_LONG == 32
 /* limit to lowmem on 32-bit systems */
 #define NUM_CACHEPAGES \
-   min(totalram_pages, 1UL << (30 - PAGE_CACHE_SHIFT) * 3 / 4)
+   min(totalram_pages, 1UL << (30 - PAGE_SHIFT) * 3 / 4)
 #else
 #define NUM_CACHEPAGES totalram_pages
 #endif
diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c 
b/drivers/staging/lustre/lustre/llite/vvp_dev.c
index e35c1a1f272e..ea29cef8e559 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_dev.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c
@@ -498,7 +498,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
id.vpi_index = vmpage->index;
/* Cant support over 16T file */
nr = !(vmpage->index > 0x);
-   page_cache_release(vmpage);
+   put_page(vmpage);
}
 
lu_object_ref_del(>co_lu, "dump", current);
@@ -581,7 +581,7 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
page = cl_vmpage_page(vmpage, clob);
unlock_page(vmpage);
 
-   page_cache_release(vmpage);
+   put_page(vmpage);
}
 
seq_printf(f, "%8x@" DFID ": ", id.vpi_index,
diff --git a/drivers/staging/lustre/lustre/lov/lov_offset.c 
b/drivers/staging/lustre/lustre/lov/lov_offset.c
index cb7b51617498..59dbdac37016 100644
--- a/drivers/staging/lustre/lustre/lov/lov_offset.c
+++ b/drivers/staging/lustre/lustre/lov/lov_offset.c
@@ -74,9 +74,9 @@ pgoff_t lov_stripe_pgoff(struct lov_stripe_md *lsm, pgoff_t 
stripe_index,
 {
loff_t offset;
 
-   offset = lov_stripe_size(lsm, stripe_index << PAGE_CACHE_SHIFT,
+   offset = lov_stripe_size(lsm, stripe_index << PAGE_SHIFT,
 stripe);
-   return offset >> PAGE_CACHE_SHIFT;
+   return offset >> PAGE_SHIFT;
 }
 
 /* we have an offset in file backed by an lov and want to find out where
diff --git a/drivers/staging/lustre/lustre/lov/lov_page.c 
b/drivers/staging/lustre/lustre/lov/lov_page.c
index 9634c13a574d..0306f00c3f33 100644
--- a/drivers/staging/lustre/lustre/lov/lov_page.c
+++ b/drivers/staging/lustre/lustre/lov/lov_page.c
@@ -83,7 +83,7 @@ static int lov_raid0_page_is_under_lock(const struct lu_env 
*env,
}
 
/* calculate the end of current stripe */
-   pps =

linux-next: manual merge of the staging tree with Linus' tree

2016-04-04 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/lustre/lnet/selftest/brw_test.c
  drivers/staging/lustre/lustre/include/lu_object.h
  drivers/staging/lustre/lustre/lclient/lcommon_cl.c
  drivers/staging/lustre/lustre/llite/llite_internal.h
  drivers/staging/lustre/lustre/llite/llite_lib.c
  drivers/staging/lustre/lustre/llite/llite_mmap.c
  drivers/staging/lustre/lustre/llite/rw.c
  drivers/staging/lustre/lustre/llite/rw26.c
  drivers/staging/lustre/lustre/llite/vvp_io.c
  drivers/staging/lustre/lustre/llite/vvp_page.c
  drivers/staging/lustre/lustre/obdclass/class_obd.c
  drivers/staging/lustre/lustre/obdecho/echo_client.c
  drivers/staging/lustre/lustre/osc/lproc_osc.c
  drivers/staging/lustre/lustre/osc/osc_cache.c
  drivers/staging/lustre/lustre/osc/osc_page.c
  drivers/staging/lustre/lustre/osc/osc_request.c

between commits:

  09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} 
macros")
  ea1754a08476 ("mm, fs: remove remaining PAGE_CACHE_* and 
page_cache_{get,release} usage")

from Linus' tree and lots of commits from the staging tree.

I fixed it up (see below the signature) 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.

I also added this merge fix patch:

From: Stephen Rothwell 
Date: Tue, 5 Apr 2016 13:38:19 +1000
Subject: [PATCH] lustre: fix ups for PAGE_CACHE_... removal

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h | 2 +-
 drivers/staging/lustre/lustre/llite/vvp_dev.c | 4 ++--
 drivers/staging/lustre/lustre/lov/lov_offset.c| 4 ++--
 drivers/staging/lustre/lustre/lov/lov_page.c  | 2 +-
 drivers/staging/lustre/lustre/osc/osc_io.c| 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h 
b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
index 6f7a276b87b7..ac4e8cfe6c8c 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
@@ -46,7 +46,7 @@
 #if BITS_PER_LONG == 32
 /* limit to lowmem on 32-bit systems */
 #define NUM_CACHEPAGES \
-   min(totalram_pages, 1UL << (30 - PAGE_CACHE_SHIFT) * 3 / 4)
+   min(totalram_pages, 1UL << (30 - PAGE_SHIFT) * 3 / 4)
 #else
 #define NUM_CACHEPAGES totalram_pages
 #endif
diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c 
b/drivers/staging/lustre/lustre/llite/vvp_dev.c
index e35c1a1f272e..ea29cef8e559 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_dev.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c
@@ -498,7 +498,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
id.vpi_index = vmpage->index;
/* Cant support over 16T file */
nr = !(vmpage->index > 0x);
-   page_cache_release(vmpage);
+   put_page(vmpage);
}
 
lu_object_ref_del(>co_lu, "dump", current);
@@ -581,7 +581,7 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
page = cl_vmpage_page(vmpage, clob);
unlock_page(vmpage);
 
-   page_cache_release(vmpage);
+   put_page(vmpage);
}
 
seq_printf(f, "%8x@" DFID ": ", id.vpi_index,
diff --git a/drivers/staging/lustre/lustre/lov/lov_offset.c 
b/drivers/staging/lustre/lustre/lov/lov_offset.c
index cb7b51617498..59dbdac37016 100644
--- a/drivers/staging/lustre/lustre/lov/lov_offset.c
+++ b/drivers/staging/lustre/lustre/lov/lov_offset.c
@@ -74,9 +74,9 @@ pgoff_t lov_stripe_pgoff(struct lov_stripe_md *lsm, pgoff_t 
stripe_index,
 {
loff_t offset;
 
-   offset = lov_stripe_size(lsm, stripe_index << PAGE_CACHE_SHIFT,
+   offset = lov_stripe_size(lsm, stripe_index << PAGE_SHIFT,
 stripe);
-   return offset >> PAGE_CACHE_SHIFT;
+   return offset >> PAGE_SHIFT;
 }
 
 /* we have an offset in file backed by an lov and want to find out where
diff --git a/drivers/staging/lustre/lustre/lov/lov_page.c 
b/drivers/staging/lustre/lustre/lov/lov_page.c
index 9634c13a574d..0306f00c3f33 100644
--- a/drivers/staging/lustre/lustre/lov/lov_page.c
+++ b/drivers/staging/lustre/lustre/lov/lov_page.c
@@ -83,7 +83,7 @@ static int lov_raid0_page_is_under_lock(const struct lu_env 
*env,
}
 
/* calculate the end of current stripe */
-   pps = loo->lo_lsm->lsm_stripe_size >>

Re: linux-next: manual merge of the staging tree with Linus' tree

2014-09-22 Thread Greg KH 
On Mon, Sep 22, 2014 at 03:01:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/iio/accel/bma180.c between commit 0668a4e4d297 ("iio: accel:
> bma180: Fix indio_dev->trig assignment") from Linus' tree and commit
> 16ed8692fa48 ("iio:bma180: Enable use of device without IRQ") from the
> staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks, the fix looks correct.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the staging tree with Linus' tree

2014-09-22 Thread Greg KH 
On Mon, Sep 22, 2014 at 03:01:24PM +1000, Stephen Rothwell wrote:
 Hi Greg,
 
 Today's linux-next merge of the staging tree got a conflict in
 drivers/iio/accel/bma180.c between commit 0668a4e4d297 (iio: accel:
 bma180: Fix indio_dev-trig assignment) from Linus' tree and commit
 16ed8692fa48 (iio:bma180: Enable use of device without IRQ) from the
 staging tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).

Thanks, the fix looks correct.

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the staging tree with Linus' tree

2014-09-21 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/iio/accel/bma180.c between commit 0668a4e4d297 ("iio: accel:
bma180: Fix indio_dev->trig assignment") from Linus' tree and commit
16ed8692fa48 ("iio:bma180: Enable use of device without IRQ") from the
staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/iio/accel/bma180.c
index 19100fddd2ed,6ef19641457c..
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@@ -553,29 -729,31 +729,31 @@@ static int bma180_probe(struct i2c_clie
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = _info;
  
-   trig = iio_trigger_alloc("%s-dev%d", indio_dev->name, indio_dev->id);
-   if (!trig) {
-   ret = -ENOMEM;
-   goto err_chip_disable;
-   }
+   if (client->irq > 0) {
+   data->trig = iio_trigger_alloc("%s-dev%d", indio_dev->name,
+   indio_dev->id);
+   if (!data->trig) {
+   ret = -ENOMEM;
+   goto err_chip_disable;
+   }
  
-   ret = devm_request_irq(>dev, client->irq,
-   iio_trigger_generic_data_rdy_poll,
-   IRQF_TRIGGER_RISING, BMA180_IRQ_NAME, trig);
-   if (ret) {
-   dev_err(>dev, "unable to request IRQ\n");
-   goto err_trigger_free;
-   }
+   ret = devm_request_irq(>dev, client->irq,
+   iio_trigger_generic_data_rdy_poll, IRQF_TRIGGER_RISING,
+   "bma180_event", data->trig);
+   if (ret) {
+   dev_err(>dev, "unable to request IRQ\n");
+   goto err_trigger_free;
+   }
  
-   trig->dev.parent = >dev;
-   trig->ops = _trigger_ops;
-   iio_trigger_set_drvdata(trig, indio_dev);
-   data->trig = trig;
-   indio_dev->trig = iio_trigger_get(trig);
+   data->trig->dev.parent = >dev;
+   data->trig->ops = _trigger_ops;
+   iio_trigger_set_drvdata(data->trig, indio_dev);
 -  indio_dev->trig = data->trig;
++  indio_dev->trig = iio_trigger_get(data->trig);
  
-   ret = iio_trigger_register(trig);
-   if (ret)
-   goto err_trigger_free;
+   ret = iio_trigger_register(data->trig);
+   if (ret)
+   goto err_trigger_free;
+   }
  
ret = iio_triggered_buffer_setup(indio_dev, NULL,
bma180_trigger_handler, NULL);


signature.asc
Description: PGP signature

linux-next: manual merge of the staging tree with Linus' tree

2014-09-21 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/iio/accel/bma180.c between commit 0668a4e4d297 (iio: accel:
bma180: Fix indio_dev-trig assignment) from Linus' tree and commit
16ed8692fa48 (iio:bma180: Enable use of device without IRQ) from the
staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/iio/accel/bma180.c
index 19100fddd2ed,6ef19641457c..
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@@ -553,29 -729,31 +729,31 @@@ static int bma180_probe(struct i2c_clie
indio_dev-modes = INDIO_DIRECT_MODE;
indio_dev-info = bma180_info;
  
-   trig = iio_trigger_alloc(%s-dev%d, indio_dev-name, indio_dev-id);
-   if (!trig) {
-   ret = -ENOMEM;
-   goto err_chip_disable;
-   }
+   if (client-irq  0) {
+   data-trig = iio_trigger_alloc(%s-dev%d, indio_dev-name,
+   indio_dev-id);
+   if (!data-trig) {
+   ret = -ENOMEM;
+   goto err_chip_disable;
+   }
  
-   ret = devm_request_irq(client-dev, client-irq,
-   iio_trigger_generic_data_rdy_poll,
-   IRQF_TRIGGER_RISING, BMA180_IRQ_NAME, trig);
-   if (ret) {
-   dev_err(client-dev, unable to request IRQ\n);
-   goto err_trigger_free;
-   }
+   ret = devm_request_irq(client-dev, client-irq,
+   iio_trigger_generic_data_rdy_poll, IRQF_TRIGGER_RISING,
+   bma180_event, data-trig);
+   if (ret) {
+   dev_err(client-dev, unable to request IRQ\n);
+   goto err_trigger_free;
+   }
  
-   trig-dev.parent = client-dev;
-   trig-ops = bma180_trigger_ops;
-   iio_trigger_set_drvdata(trig, indio_dev);
-   data-trig = trig;
-   indio_dev-trig = iio_trigger_get(trig);
+   data-trig-dev.parent = client-dev;
+   data-trig-ops = bma180_trigger_ops;
+   iio_trigger_set_drvdata(data-trig, indio_dev);
 -  indio_dev-trig = data-trig;
++  indio_dev-trig = iio_trigger_get(data-trig);
  
-   ret = iio_trigger_register(trig);
-   if (ret)
-   goto err_trigger_free;
+   ret = iio_trigger_register(data-trig);
+   if (ret)
+   goto err_trigger_free;
+   }
  
ret = iio_triggered_buffer_setup(indio_dev, NULL,
bma180_trigger_handler, NULL);


signature.asc
Description: PGP signature

Re: linux-next: manual merge of the staging tree with Linus' tree

2013-03-15 Thread Greg KH 
On Fri, Mar 15, 2013 at 03:13:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/ccg/f_fs.c between commit 7f78e0351394 ("fs: Limit
> sys_mount to only request filesystem modules") from Linus' tree and
> commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from the
> staging tree.
> 
> The latter deleted the file, so I did that and can carry the fix as
> necessary (no action is required).

Thanks, that's the correct fix :)

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the staging tree with Linus' tree

2013-03-15 Thread Greg KH 
On Fri, Mar 15, 2013 at 03:13:34PM +1100, Stephen Rothwell wrote:
 Hi Greg,
 
 Today's linux-next merge of the staging tree got a conflict in
 drivers/staging/ccg/f_fs.c between commit 7f78e0351394 (fs: Limit
 sys_mount to only request filesystem modules) from Linus' tree and
 commit 515e6dd20b3f (Staging: ccg: delete it from the tree) from the
 staging tree.
 
 The latter deleted the file, so I did that and can carry the fix as
 necessary (no action is required).

Thanks, that's the correct fix :)

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the staging tree with Linus' tree

2013-03-14 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ccg/f_fs.c between commit 7f78e0351394 ("fs: Limit
sys_mount to only request filesystem modules") from Linus' tree and
commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from the
staging tree.

The latter deleted the file, so I did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp1RXubjgH6I.pgp
Description: PGP signature

linux-next: manual merge of the staging tree with Linus' tree

2013-03-14 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ccg/f_fs.c between commit 7f78e0351394 (fs: Limit
sys_mount to only request filesystem modules) from Linus' tree and
commit 515e6dd20b3f (Staging: ccg: delete it from the tree) from the
staging tree.

The latter deleted the file, so I did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp1RXubjgH6I.pgp
Description: PGP signature

Re: linux-next: manual merge of the staging tree with Linus' tree

2013-01-17 Thread Greg KH 
On Thu, Jan 17, 2013 at 01:35:33PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/zram/zram_drv.c between commit 397c60668aa5 ("staging:
> zram: fix invalid memory references during disk write") from Linus' tree
> and commit d178a07c4bd3 ("staging: zram: drop zram_stat_dec/inc
> functions") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the staging tree with Linus' tree

2013-01-17 Thread Greg KH 
On Thu, Jan 17, 2013 at 01:35:33PM +1100, Stephen Rothwell wrote:
 Hi Greg,
 
 Today's linux-next merge of the staging tree got a conflict in
 drivers/staging/zram/zram_drv.c between commit 397c60668aa5 (staging:
 zram: fix invalid memory references during disk write) from Linus' tree
 and commit d178a07c4bd3 (staging: zram: drop zram_stat_dec/inc
 functions) from the staging tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).

Looks good, thanks.

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the staging tree with Linus' tree

2013-01-16 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/zram/zram_drv.c between commit 397c60668aa5 ("staging:
zram: fix invalid memory references during disk write") from Linus' tree
and commit d178a07c4bd3 ("staging: zram: drop zram_stat_dec/inc
functions") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/staging/zram/zram_drv.c
index f2a73bd,6762b99..000
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -300,19 -291,17 +289,19 @@@ static int zram_bvec_write(struct zram 
  
user_mem = kmap_atomic(page);
  
 -  if (is_partial_io(bvec))
 +  if (is_partial_io(bvec)) {
memcpy(uncmem + offset, user_mem + bvec->bv_offset,
   bvec->bv_len);
 -  else
 +  kunmap_atomic(user_mem);
 +  user_mem = NULL;
 +  } else {
uncmem = user_mem;
 +  }
  
if (page_zero_filled(uncmem)) {
 -  kunmap_atomic(user_mem);
 -  if (is_partial_io(bvec))
 -  kfree(uncmem);
 +  if (!is_partial_io(bvec))
 +  kunmap_atomic(user_mem);
-   zram_stat_inc(>stats.pages_zero);
+   zram->stats.pages_zero++;
zram_set_flag(zram, index, ZRAM_ZERO);
ret = 0;
goto out;
@@@ -333,11 -320,9 +322,11 @@@
}
  
if (unlikely(clen > max_zpage_size)) {
-   zram_stat_inc(>stats.bad_compress);
+   zram->stats.bad_compress++;
 -  src = uncmem;
clen = PAGE_SIZE;
 +  src = NULL;
 +  if (is_partial_io(bvec))
 +  src = uncmem;
}
  
handle = zs_malloc(zram->mem_pool, clen);
@@@ -362,14 -343,13 +351,14 @@@
  
/* Update stats */
zram_stat64_add(zram, >stats.compr_size, clen);
-   zram_stat_inc(>stats.pages_stored);
+   zram->stats.pages_stored++;
if (clen <= PAGE_SIZE / 2)
-   zram_stat_inc(>stats.good_compress);
+   zram->stats.good_compress++;
  
 -  return 0;
 -
  out:
 +  if (is_partial_io(bvec))
 +  kfree(uncmem);
 +
if (ret)
zram_stat64_inc(zram, >stats.failed_writes);
return ret;


pgp5mHcCSsQPZ.pgp
Description: PGP signature

linux-next: manual merge of the staging tree with Linus' tree

2013-01-16 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/zram/zram_drv.c between commit 397c60668aa5 (staging:
zram: fix invalid memory references during disk write) from Linus' tree
and commit d178a07c4bd3 (staging: zram: drop zram_stat_dec/inc
functions) from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/staging/zram/zram_drv.c
index f2a73bd,6762b99..000
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -300,19 -291,17 +289,19 @@@ static int zram_bvec_write(struct zram 
  
user_mem = kmap_atomic(page);
  
 -  if (is_partial_io(bvec))
 +  if (is_partial_io(bvec)) {
memcpy(uncmem + offset, user_mem + bvec-bv_offset,
   bvec-bv_len);
 -  else
 +  kunmap_atomic(user_mem);
 +  user_mem = NULL;
 +  } else {
uncmem = user_mem;
 +  }
  
if (page_zero_filled(uncmem)) {
 -  kunmap_atomic(user_mem);
 -  if (is_partial_io(bvec))
 -  kfree(uncmem);
 +  if (!is_partial_io(bvec))
 +  kunmap_atomic(user_mem);
-   zram_stat_inc(zram-stats.pages_zero);
+   zram-stats.pages_zero++;
zram_set_flag(zram, index, ZRAM_ZERO);
ret = 0;
goto out;
@@@ -333,11 -320,9 +322,11 @@@
}
  
if (unlikely(clen  max_zpage_size)) {
-   zram_stat_inc(zram-stats.bad_compress);
+   zram-stats.bad_compress++;
 -  src = uncmem;
clen = PAGE_SIZE;
 +  src = NULL;
 +  if (is_partial_io(bvec))
 +  src = uncmem;
}
  
handle = zs_malloc(zram-mem_pool, clen);
@@@ -362,14 -343,13 +351,14 @@@
  
/* Update stats */
zram_stat64_add(zram, zram-stats.compr_size, clen);
-   zram_stat_inc(zram-stats.pages_stored);
+   zram-stats.pages_stored++;
if (clen = PAGE_SIZE / 2)
-   zram_stat_inc(zram-stats.good_compress);
+   zram-stats.good_compress++;
  
 -  return 0;
 -
  out:
 +  if (is_partial_io(bvec))
 +  kfree(uncmem);
 +
if (ret)
zram_stat64_inc(zram, zram-stats.failed_writes);
return ret;


pgp5mHcCSsQPZ.pgp
Description: PGP signature