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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2323 bytes --]

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 Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/iio/accel/bma180.c
index 19100fddd2ed,6ef19641457c..000000000000
--- 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);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[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

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

[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..000000000000
> --- 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(&i2c->dev, "AK8974 reset failed\n");
>  -		goto power_off;
>  +		goto disable_pm;
>   	}
>   
> - 	indio_dev->dev.parent = &i2c->dev;
>  -	pm_runtime_set_autosuspend_delay(&i2c->dev,
>  -					 AK8974_AUTOSUSPEND_DELAY);
>  -	pm_runtime_use_autosuspend(&i2c->dev);
>  -	pm_runtime_put(&i2c->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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]

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..000000000000
--- 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(&i2c->dev, "AK8974 reset failed\n");
 -		goto power_off;
 +		goto disable_pm;
  	}
  
- 	indio_dev->dev.parent = &i2c->dev;
 -	pm_runtime_set_autosuspend_delay(&i2c->dev,
 -					 AK8974_AUTOSUSPEND_DELAY);
 -	pm_runtime_use_autosuspend(&i2c->dev);
 -	pm_runtime_put(&i2c->dev);
 -
  	switch (ak8974->variant) {
  	case AK8974_WHOAMI_VALUE_AMI306:
  	case AK8974_WHOAMI_VALUE_AMI305:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 842 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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

[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 <sfr@canb.auug.org.au>
Date: Tue, 5 Apr 2016 13:38:19 +1000
Subject: [PATCH] lustre: fix ups for PAGE_CACHE_... removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 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 > 0xffffffff);
-				page_cache_release(vmpage);
+				put_page(vmpage);
 			}
 
 			lu_object_ref_del(&clob->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 >> PAGE_CACHE_SHIFT;
+	pps = loo->lo_lsm->lsm_stripe_size >> PAGE_SHIFT;
 	index = ((slice->cpl_index + pps) & ~(pps - 1)) - 1;
 
 	/* never exceed the end of the stripe */
diff --git a/drivers/staging/lustre/lustre/osc/osc_io.c b/drivers/staging/lustre/lustre/osc/osc_io.c
index cf7743d2f148..894007854ce7 100644
--- a/drivers/staging/lustre/lustre/osc/osc_io.c
+++ b/drivers/staging/lustre/lustre/osc/osc_io.c
@@ -321,7 +321,7 @@ static int osc_io_rw_iter_init(const struct lu_env *env,
 	if (cl_io_is_append(io))
 		return 0;
 
-	npages = io->u.ci_rw.crw_count >> PAGE_CACHE_SHIFT;
+	npages = io->u.ci_rw.crw_count >> PAGE_SHIFT;
 	if (io->u.ci_rw.crw_pos & ~PAGE_MASK)
 		++npages;
 
-- 
2.7.0


-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/lustre/lnet/selftest/brw_test.c
index dcb6e506f592,1988cee36751..000000000000
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@@ -90,8 -90,7 +90,7 @@@ brw_client_init(sfw_test_instance_t *ts
  		 * NB: this is not going to work for variable page size,
  		 * but we have to keep it for compatibility
  		 */
 -		len = npg * PAGE_CACHE_SIZE;
 +		len = npg * PAGE_SIZE;
- 
  	} else {
  		test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
  
@@@ -278,8 -277,7 +277,7 @@@ brw_client_prep_rpc(sfw_test_unit_t *ts
  		opc = breq->blk_opc;
  		flags = breq->blk_flags;
  		npg = breq->blk_npg;
 -		len = npg * PAGE_CACHE_SIZE;
 +		len = npg * PAGE_SIZE;
- 
  	} else {
  		test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
  
diff --cc drivers/staging/lustre/lustre/include/lu_object.h
index 242bb1ef6245,fcb9db6e1f1a..000000000000
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@@ -1118,7 -1118,7 +1118,7 @@@ struct lu_context_key 
  	{							 \
  		type *value;				      \
  								  \
- 		CLASSERT(PAGE_SIZE >= sizeof (*value));       \
 -		CLASSERT(PAGE_CACHE_SIZE >= sizeof(*value));       \
++		CLASSERT(PAGE_SIZE >= sizeof(*value));       \
  								  \
  		value = kzalloc(sizeof(*value), GFP_NOFS);	\
  		if (!value)				\
diff --cc drivers/staging/lustre/lustre/llite/llite_internal.h
index e3c0f1dd4d31,ba24f09ba1f9..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@@ -981,7 -907,11 +907,11 @@@ static inline void ll_invalidate_page(s
  	if (!mapping)
  		return;
  
+ 	/*
+ 	 * truncate_complete_page() calls
+ 	 * a_ops->invalidatepage()->cl_page_delete()->vvp_page_delete().
+ 	 */
 -	ll_teardown_mmaps(mapping, offset, offset + PAGE_CACHE_SIZE);
 +	ll_teardown_mmaps(mapping, offset, offset + PAGE_SIZE);
  	truncate_complete_page(mapping, vmpage);
  }
  
diff --cc drivers/staging/lustre/lustre/llite/llite_mmap.c
index 5b484e62ffd0,5b4382cca0d7..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@@ -57,10 -57,10 +57,10 @@@ void policy_from_vma(ldlm_policy_data_
  		     struct vm_area_struct *vma, unsigned long addr,
  		     size_t count)
  {
- 	policy->l_extent.start = ((addr - vma->vm_start) & CFS_PAGE_MASK) +
+ 	policy->l_extent.start = ((addr - vma->vm_start) & PAGE_MASK) +
 -				 (vma->vm_pgoff << PAGE_CACHE_SHIFT);
 +				 (vma->vm_pgoff << PAGE_SHIFT);
  	policy->l_extent.end = (policy->l_extent.start + count - 1) |
- 			       ~CFS_PAGE_MASK;
+ 			       ~PAGE_MASK;
  }
  
  struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,
diff --cc drivers/staging/lustre/lustre/llite/rw.c
index edab6c5b7e50,7d5dd3848552..000000000000
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@@ -776,8 -643,8 +643,8 @@@ int ll_readahead(const struct lu_env *e
  	if (reserved != 0)
  		ll_ra_count_put(ll_i2sbi(inode), reserved);
  
 -	if (ra_end == end + 1 && ra_end == (kms >> PAGE_CACHE_SHIFT))
 +	if (ra_end == end + 1 && ra_end == (kms >> PAGE_SHIFT))
- 		ll_ra_stats_inc(mapping, RA_STAT_EOF);
+ 		ll_ra_stats_inc(inode, RA_STAT_EOF);
  
  	/* if we didn't get to the end of the region we reserved from
  	 * the ras we need to go back and update the ras so that the
diff --cc drivers/staging/lustre/lustre/llite/rw26.c
index 69aa15e8e3ef,65baeebead72..000000000000
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@@ -382,11 -367,11 +367,11 @@@ static ssize_t ll_direct_IO_26(struct k
  	CDEBUG(D_VFSTRACE,
  	       "VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\n",
  	       inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
 -	       file_offset, file_offset, count >> PAGE_CACHE_SHIFT,
 -	       MAX_DIO_SIZE >> PAGE_CACHE_SHIFT);
 +	       file_offset, file_offset, count >> PAGE_SHIFT,
 +	       MAX_DIO_SIZE >> PAGE_SHIFT);
  
  	/* Check that all user buffers are aligned as well */
- 	if (iov_iter_alignment(iter) & ~CFS_PAGE_MASK)
+ 	if (iov_iter_alignment(iter) & ~PAGE_MASK)
  		return -EINVAL;
  
  	env = cl_env_get(&refcheck);
@@@ -432,11 -417,11 +417,11 @@@
  			 * page worth of page pointers = 4MB on i386.
  			 */
  			if (result == -ENOMEM &&
 -			    size > (PAGE_CACHE_SIZE / sizeof(*pages)) *
 -				   PAGE_CACHE_SIZE) {
 +			    size > (PAGE_SIZE / sizeof(*pages)) *
 +			    PAGE_SIZE) {
  				size = ((((size / 2) - 1) |
- 					 ~CFS_PAGE_MASK) + 1) &
- 					CFS_PAGE_MASK;
+ 					 ~PAGE_MASK) + 1) &
+ 					PAGE_MASK;
  				CDEBUG(D_VFSTRACE, "DIO size now %lu\n",
  				       size);
  				continue;
@@@ -474,37 -488,159 +488,159 @@@ static int ll_write_begin(struct file *
  			  loff_t pos, unsigned len, unsigned flags,
  			  struct page **pagep, void **fsdata)
  {
+ 	struct ll_cl_context *lcc;
+ 	struct lu_env  *env;
+ 	struct cl_io   *io;
+ 	struct cl_page *page;
+ 	struct cl_object *clob = ll_i2info(mapping->host)->lli_clob;
 -	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
 +	pgoff_t index = pos >> PAGE_SHIFT;
- 	struct page *page;
- 	int rc;
- 	unsigned from = pos & (PAGE_SIZE - 1);
+ 	struct page *vmpage = NULL;
 -	unsigned int from = pos & (PAGE_CACHE_SIZE - 1);
++	unsigned int from = pos & (PAGE_SIZE - 1);
+ 	unsigned int to = from + len;
+ 	int result = 0;
  
- 	page = grab_cache_page_write_begin(mapping, index, flags);
- 	if (!page)
- 		return -ENOMEM;
+ 	CDEBUG(D_VFSTRACE, "Writing %lu of %d to %d bytes\n", index, from, len);
+ 
+ 	lcc = ll_cl_init(file, NULL);
+ 	if (IS_ERR(lcc)) {
+ 		result = PTR_ERR(lcc);
+ 		goto out;
+ 	}
+ 
+ 	env = lcc->lcc_env;
+ 	io  = lcc->lcc_io;
+ 
+ 	/* To avoid deadlock, try to lock page first. */
+ 	vmpage = grab_cache_page_nowait(mapping, index);
+ 	if (unlikely(!vmpage || PageDirty(vmpage) || PageWriteback(vmpage))) {
+ 		struct vvp_io *vio = vvp_env_io(env);
+ 		struct cl_page_list *plist = &vio->u.write.vui_queue;
  
- 	*pagep = page;
+ 		/* if the page is already in dirty cache, we have to commit
+ 		 * the pages right now; otherwise, it may cause deadlock
+ 		 * because it holds page lock of a dirty page and request for
+ 		 * more grants. It's okay for the dirty page to be the first
+ 		 * one in commit page list, though.
+ 		 */
+ 		if (vmpage && plist->pl_nr > 0) {
+ 			unlock_page(vmpage);
 -			page_cache_release(vmpage);
++			put_page(vmpage);
+ 			vmpage = NULL;
+ 		}
  
- 	rc = ll_prepare_write(file, page, from, from + len);
- 	if (rc) {
- 		unlock_page(page);
- 		put_page(page);
+ 		/* commit pages and then wait for page lock */
+ 		result = vvp_io_write_commit(env, io);
+ 		if (result < 0)
+ 			goto out;
+ 
+ 		if (!vmpage) {
+ 			vmpage = grab_cache_page_write_begin(mapping, index,
+ 							     flags);
+ 			if (!vmpage) {
+ 				result = -ENOMEM;
+ 				goto out;
+ 			}
+ 		}
  	}
- 	return rc;
+ 
+ 	page = cl_page_find(env, clob, vmpage->index, vmpage, CPT_CACHEABLE);
+ 	if (IS_ERR(page)) {
+ 		result = PTR_ERR(page);
+ 		goto out;
+ 	}
+ 
+ 	lcc->lcc_page = page;
+ 	lu_ref_add(&page->cp_reference, "cl_io", io);
+ 
+ 	cl_page_assume(env, io, page);
+ 	if (!PageUptodate(vmpage)) {
+ 		/*
+ 		 * We're completely overwriting an existing page,
+ 		 * so _don't_ set it up to date until commit_write
+ 		 */
+ 		if (from == 0 && to == PAGE_SIZE) {
+ 			CL_PAGE_HEADER(D_PAGE, env, page, "full page write\n");
+ 			POISON_PAGE(vmpage, 0x11);
+ 		} else {
+ 			/* TODO: can be optimized at OSC layer to check if it
+ 			 * is a lockless IO. In that case, it's not necessary
+ 			 * to read the data.
+ 			 */
+ 			result = ll_prepare_partial_page(env, io, page);
+ 			if (result == 0)
+ 				SetPageUptodate(vmpage);
+ 		}
+ 	}
+ 	if (result < 0)
+ 		cl_page_unassume(env, io, page);
+ out:
+ 	if (result < 0) {
+ 		if (vmpage) {
+ 			unlock_page(vmpage);
 -			page_cache_release(vmpage);
++			put_page(vmpage);
+ 		}
+ 		if (!IS_ERR(lcc))
+ 			ll_cl_fini(lcc);
+ 	} else {
+ 		*pagep = vmpage;
+ 		*fsdata = lcc;
+ 	}
+ 	return result;
  }
  
  static int ll_write_end(struct file *file, struct address_space *mapping,
  			loff_t pos, unsigned len, unsigned copied,
- 			struct page *page, void *fsdata)
+ 			struct page *vmpage, void *fsdata)
  {
+ 	struct ll_cl_context *lcc = fsdata;
+ 	struct lu_env *env;
+ 	struct cl_io *io;
+ 	struct vvp_io *vio;
+ 	struct cl_page *page;
 -	unsigned from = pos & (PAGE_CACHE_SIZE - 1);
 +	unsigned from = pos & (PAGE_SIZE - 1);
- 	int rc;
+ 	bool unplug = false;
+ 	int result = 0;
+ 
 -	page_cache_release(vmpage);
++	put_page(vmpage);
+ 
+ 	env  = lcc->lcc_env;
+ 	page = lcc->lcc_page;
+ 	io   = lcc->lcc_io;
+ 	vio  = vvp_env_io(env);
+ 
+ 	LASSERT(cl_page_is_owned(page, io));
+ 	if (copied > 0) {
+ 		struct cl_page_list *plist = &vio->u.write.vui_queue;
+ 
+ 		lcc->lcc_page = NULL; /* page will be queued */
+ 
+ 		/* Add it into write queue */
+ 		cl_page_list_add(plist, page);
+ 		if (plist->pl_nr == 1) /* first page */
+ 			vio->u.write.vui_from = from;
+ 		else
+ 			LASSERT(from == 0);
+ 		vio->u.write.vui_to = from + copied;
+ 
+ 		/* We may have one full RPC, commit it soon */
+ 		if (plist->pl_nr >= PTLRPC_MAX_BRW_PAGES)
+ 			unplug = true;
+ 
+ 		CL_PAGE_DEBUG(D_VFSTRACE, env, page,
+ 			      "queued page: %d.\n", plist->pl_nr);
+ 	} else {
+ 		cl_page_disown(env, io, page);
+ 
+ 		/* page list is not contiguous now, commit it now */
+ 		unplug = true;
+ 	}
  
- 	rc = ll_commit_write(file, page, from, from + copied);
- 	unlock_page(page);
- 	put_page(page);
+ 	if (unplug ||
+ 	    file->f_flags & O_SYNC || IS_SYNC(file_inode(file)))
+ 		result = vvp_io_write_commit(env, io);
  
- 	return rc ?: copied;
+ 	ll_cl_fini(lcc);
+ 	return result >= 0 ? copied : result;
  }
  
  #ifdef CONFIG_MIGRATION
diff --cc drivers/staging/lustre/lustre/llite/vvp_io.c
index 85a835976174,aed7b8e41a51..000000000000
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@@ -95,6 -104,115 +104,115 @@@ static bool can_populate_pages(const st
  	return rc;
  }
  
+ static void vvp_object_size_lock(struct cl_object *obj)
+ {
+ 	struct inode *inode = vvp_object_inode(obj);
+ 
+ 	ll_inode_size_lock(inode);
+ 	cl_object_attr_lock(obj);
+ }
+ 
+ static void vvp_object_size_unlock(struct cl_object *obj)
+ {
+ 	struct inode *inode = vvp_object_inode(obj);
+ 
+ 	cl_object_attr_unlock(obj);
+ 	ll_inode_size_unlock(inode);
+ }
+ 
+ /**
+  * Helper function that if necessary adjusts file size (inode->i_size), when
+  * position at the offset \a pos is accessed. File size can be arbitrary stale
+  * on a Lustre client, but client at least knows KMS. If accessed area is
+  * inside [0, KMS], set file size to KMS, otherwise glimpse file size.
+  *
+  * Locking: cl_isize_lock is used to serialize changes to inode size and to
+  * protect consistency between inode size and cl_object
+  * attributes. cl_object_size_lock() protects consistency between cl_attr's of
+  * top-object and sub-objects.
+  */
+ static int vvp_prep_size(const struct lu_env *env, struct cl_object *obj,
+ 			 struct cl_io *io, loff_t start, size_t count,
+ 			 int *exceed)
+ {
+ 	struct cl_attr *attr  = vvp_env_thread_attr(env);
+ 	struct inode   *inode = vvp_object_inode(obj);
+ 	loff_t	  pos   = start + count - 1;
+ 	loff_t kms;
+ 	int result;
+ 
+ 	/*
+ 	 * Consistency guarantees: following possibilities exist for the
+ 	 * relation between region being accessed and real file size at this
+ 	 * moment:
+ 	 *
+ 	 *  (A): the region is completely inside of the file;
+ 	 *
+ 	 *  (B-x): x bytes of region are inside of the file, the rest is
+ 	 *  outside;
+ 	 *
+ 	 *  (C): the region is completely outside of the file.
+ 	 *
+ 	 * This classification is stable under DLM lock already acquired by
+ 	 * the caller, because to change the class, other client has to take
+ 	 * DLM lock conflicting with our lock. Also, any updates to ->i_size
+ 	 * by other threads on this client are serialized by
+ 	 * ll_inode_size_lock(). This guarantees that short reads are handled
+ 	 * correctly in the face of concurrent writes and truncates.
+ 	 */
+ 	vvp_object_size_lock(obj);
+ 	result = cl_object_attr_get(env, obj, attr);
+ 	if (result == 0) {
+ 		kms = attr->cat_kms;
+ 		if (pos > kms) {
+ 			/*
+ 			 * A glimpse is necessary to determine whether we
+ 			 * return a short read (B) or some zeroes at the end
+ 			 * of the buffer (C)
+ 			 */
+ 			vvp_object_size_unlock(obj);
+ 			result = cl_glimpse_lock(env, io, inode, obj, 0);
+ 			if (result == 0 && exceed) {
+ 				/* If objective page index exceed end-of-file
+ 				 * page index, return directly. Do not expect
+ 				 * kernel will check such case correctly.
+ 				 * linux-2.6.18-128.1.1 miss to do that.
+ 				 * --bug 17336
+ 				 */
+ 				loff_t size = i_size_read(inode);
 -				loff_t cur_index = start >> PAGE_CACHE_SHIFT;
++				loff_t cur_index = start >> PAGE_SHIFT;
+ 				loff_t size_index = (size - 1) >>
 -						    PAGE_CACHE_SHIFT;
++						    PAGE_SHIFT;
+ 
+ 				if ((size == 0 && cur_index != 0) ||
+ 				    size_index < cur_index)
+ 					*exceed = 1;
+ 			}
+ 			return result;
+ 		}
+ 		/*
+ 		 * region is within kms and, hence, within real file
+ 		 * size (A). We need to increase i_size to cover the
+ 		 * read region so that generic_file_read() will do its
+ 		 * job, but that doesn't mean the kms size is
+ 		 * _correct_, it is only the _minimum_ size. If
+ 		 * someone does a stat they will get the correct size
+ 		 * which will always be >= the kms value here.
+ 		 * b=11081
+ 		 */
+ 		if (i_size_read(inode) < kms) {
+ 			i_size_write(inode, kms);
+ 			CDEBUG(D_VFSTRACE, DFID " updating i_size %llu\n",
+ 			       PFID(lu_object_fid(&obj->co_lu)),
+ 			       (__u64)i_size_read(inode));
+ 		}
+ 	}
+ 
+ 	vvp_object_size_unlock(obj);
+ 
+ 	return result;
+ }
+ 
  /*****************************************************************************
   *
   * io operations.
@@@ -505,17 -708,14 +708,14 @@@ static int vvp_io_read_start(const stru
  			 inode->i_ino, cnt, pos, i_size_read(inode));
  
  	/* turn off the kernel's read-ahead */
- 	cio->cui_fd->fd_file->f_ra.ra_pages = 0;
+ 	vio->vui_fd->fd_file->f_ra.ra_pages = 0;
  
  	/* initialize read-ahead window once per syscall */
- 	if (!vio->cui_ra_window_set) {
- 		vio->cui_ra_window_set = 1;
- 		bead->lrr_start = cl_index(obj, pos);
- 		/*
- 		 * XXX: explicit PAGE_SIZE
- 		 */
- 		bead->lrr_count = cl_index(obj, tot + PAGE_SIZE - 1);
- 		ll_ra_read_in(file, bead);
+ 	if (!vio->vui_ra_valid) {
+ 		vio->vui_ra_valid = true;
+ 		vio->vui_ra_start = cl_index(obj, pos);
 -		vio->vui_ra_count = cl_index(obj, tot + PAGE_CACHE_SIZE - 1);
++		vio->vui_ra_count = cl_index(obj, tot + PAGE_SIZE - 1);
+ 		ll_ras_enter(file);
  	}
  
  	/* BUG: 5972 */
diff --cc drivers/staging/lustre/lustre/llite/vvp_page.c
index 33ca3eb34965,0c92293dbf2e..000000000000
--- a/drivers/staging/lustre/lustre/llite/vvp_page.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c
@@@ -52,12 -59,12 +59,12 @@@
   *
   */
  
- static void vvp_page_fini_common(struct ccc_page *cp)
+ static void vvp_page_fini_common(struct vvp_page *vpg)
  {
- 	struct page *vmpage = cp->cpg_page;
+ 	struct page *vmpage = vpg->vpg_page;
  
  	LASSERT(vmpage);
 -	page_cache_release(vmpage);
 +	put_page(vmpage);
  }
  
  static void vvp_page_fini(const struct lu_env *env,
@@@ -530,27 -553,31 +553,31 @@@ static const struct cl_page_operations 
  };
  
  int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
- 		  struct cl_page *page, struct page *vmpage)
+ 		struct cl_page *page, pgoff_t index)
  {
- 	struct ccc_page *cpg = cl_object_page_slice(obj, page);
+ 	struct vvp_page *vpg = cl_object_page_slice(obj, page);
+ 	struct page     *vmpage = page->cp_vmpage;
  
- 	CLOBINVRNT(env, obj, ccc_object_invariant(obj));
+ 	CLOBINVRNT(env, obj, vvp_object_invariant(obj));
  
- 	cpg->cpg_page = vmpage;
+ 	vpg->vpg_page = vmpage;
 -	page_cache_get(vmpage);
 +	get_page(vmpage);
  
- 	INIT_LIST_HEAD(&cpg->cpg_pending_linkage);
+ 	INIT_LIST_HEAD(&vpg->vpg_pending_linkage);
  	if (page->cp_type == CPT_CACHEABLE) {
+ 		/* in cache, decref in vvp_page_delete */
+ 		atomic_inc(&page->cp_ref);
  		SetPagePrivate(vmpage);
  		vmpage->private = (unsigned long)page;
- 		cl_page_slice_add(page, &cpg->cpg_cl, obj, &vvp_page_ops);
+ 		cl_page_slice_add(page, &vpg->vpg_cl, obj, index,
+ 				  &vvp_page_ops);
  	} else {
- 		struct ccc_object *clobj = cl2ccc(obj);
+ 		struct vvp_object *clobj = cl2vvp(obj);
  
- 		LASSERT(!inode_trylock(clobj->cob_inode));
- 		cl_page_slice_add(page, &cpg->cpg_cl, obj,
+ 		LASSERT(!inode_trylock(clobj->vob_inode));
+ 		cl_page_slice_add(page, &vpg->vpg_cl, obj, index,
  				  &vvp_transient_page_ops);
- 		clobj->cob_transient_pages++;
+ 		clobj->vob_transient_pages++;
  	}
  	return 0;
  }
diff --cc drivers/staging/lustre/lustre/obdclass/class_obd.c
index c2cf015962dd,d9844ba8b9be..000000000000
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@@ -461,9 -461,9 +461,9 @@@ static int obd_init_checks(void
  		CWARN("LPD64 wrong length! strlen(%s)=%d != 2\n", buf, len);
  		ret = -EINVAL;
  	}
- 	if ((u64val & ~CFS_PAGE_MASK) >= PAGE_SIZE) {
 -	if ((u64val & ~PAGE_MASK) >= PAGE_CACHE_SIZE) {
++	if ((u64val & ~PAGE_MASK) >= PAGE_SIZE) {
  		CWARN("mask failed: u64val %llu >= %llu\n", u64val,
 -		      (__u64)PAGE_CACHE_SIZE);
 +		      (__u64)PAGE_SIZE);
  		ret = -EINVAL;
  	}
  
diff --cc drivers/staging/lustre/lustre/obdecho/echo_client.c
index 1e83669c204d,a752bb4e946b..000000000000
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@@ -273,12 -266,10 +266,10 @@@ static void echo_page_completion(const 
  static void echo_page_fini(const struct lu_env *env,
  			   struct cl_page_slice *slice)
  {
- 	struct echo_page *ep    = cl2echo_page(slice);
  	struct echo_object *eco = cl2echo_obj(slice->cpl_obj);
- 	struct page *vmpage      = ep->ep_vmpage;
  
  	atomic_dec(&eco->eo_npages);
- 	put_page(vmpage);
 -	page_cache_release(slice->cpl_page->cp_vmpage);
++	put_page(slice->cpl_page->cp_vmpage);
  }
  
  static int echo_page_prep(const struct lu_env *env,
@@@ -372,10 -345,9 +345,9 @@@ static int echo_page_init(const struct 
  	struct echo_page *ep = cl_object_page_slice(obj, page);
  	struct echo_object *eco = cl2echo_obj(obj);
  
- 	ep->ep_vmpage = vmpage;
- 	get_page(vmpage);
 -	page_cache_get(page->cp_vmpage);
++	get_page(page->cp_vmpage);
  	mutex_init(&ep->ep_lock);
- 	cl_page_slice_add(page, &ep->ep_cl, obj, &echo_page_ops);
+ 	cl_page_slice_add(page, &ep->ep_cl, obj, index, &echo_page_ops);
  	atomic_inc(&eco->eo_npages);
  	return 0;
  }
@@@ -1470,11 -1429,11 +1429,11 @@@ static int echo_client_prep_commit(cons
  	u64 npages, tot_pages;
  	int i, ret = 0, brw_flags = 0;
  
- 	if (count <= 0 || (count & (~CFS_PAGE_MASK)) != 0)
+ 	if (count <= 0 || (count & (~PAGE_MASK)) != 0)
  		return -EINVAL;
  
 -	npages = batch >> PAGE_CACHE_SHIFT;
 -	tot_pages = count >> PAGE_CACHE_SHIFT;
 +	npages = batch >> PAGE_SHIFT;
 +	tot_pages = count >> PAGE_SHIFT;
  
  	lnb = kcalloc(npages, sizeof(struct niobuf_local), GFP_NOFS);
  	rnb = kcalloc(npages, sizeof(struct niobuf_remote), GFP_NOFS);
diff --cc drivers/staging/lustre/lustre/osc/lproc_osc.c
index a3358c39b2f1,911e5054a9c4..000000000000
--- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
@@@ -169,10 -169,10 +169,10 @@@ static ssize_t max_dirty_mb_store(struc
  	    pages_number > totalram_pages / 4) /* 1/4 of RAM */
  		return -ERANGE;
  
- 	client_obd_list_lock(&cli->cl_loi_list_lock);
+ 	spin_lock(&cli->cl_loi_list_lock);
 -	cli->cl_dirty_max = (u32)(pages_number << PAGE_CACHE_SHIFT);
 +	cli->cl_dirty_max = (u32)(pages_number << PAGE_SHIFT);
  	osc_wake_cache_waiters(cli);
- 	client_obd_list_unlock(&cli->cl_loi_list_lock);
+ 	spin_unlock(&cli->cl_loi_list_lock);
  
  	return count;
  }
@@@ -569,17 -577,17 +577,17 @@@ static ssize_t max_pages_per_rpc_store(
  
  	/* if the max_pages is specified in bytes, convert to pages */
  	if (val >= ONE_MB_BRW_SIZE)
 -		val >>= PAGE_CACHE_SHIFT;
 +		val >>= PAGE_SHIFT;
  
 -	chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_CACHE_SHIFT)) - 1);
 +	chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_SHIFT)) - 1);
  	/* max_pages_per_rpc must be chunk aligned */
  	val = (val + ~chunk_mask) & chunk_mask;
 -	if (val == 0 || val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT) {
 +	if (val == 0 || val > ocd->ocd_brw_size >> PAGE_SHIFT) {
  		return -ERANGE;
  	}
- 	client_obd_list_lock(&cli->cl_loi_list_lock);
+ 	spin_lock(&cli->cl_loi_list_lock);
  	cli->cl_max_pages_per_rpc = val;
- 	client_obd_list_unlock(&cli->cl_loi_list_lock);
+ 	spin_unlock(&cli->cl_loi_list_lock);
  
  	return count;
  }
diff --cc drivers/staging/lustre/lustre/osc/osc_cache.c
index 5f25bf83dcfc,d01f2a207a91..000000000000
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@@ -543,8 -556,8 +556,8 @@@ static int osc_extent_merge(const struc
  	if (cur->oe_max_end != victim->oe_max_end)
  		return -ERANGE;
  
- 	LASSERT(cur->oe_osclock == victim->oe_osclock);
+ 	LASSERT(cur->oe_dlmlock == victim->oe_dlmlock);
 -	ppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_CACHE_SHIFT;
 +	ppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_SHIFT;
  	chunk_start = cur->oe_start >> ppc_bits;
  	chunk_end = cur->oe_end >> ppc_bits;
  	if (chunk_start != (victim->oe_end >> ppc_bits) + 1 &&
@@@ -644,11 -657,15 +657,15 @@@ static struct osc_extent *osc_extent_fi
  	if (!cur)
  		return ERR_PTR(-ENOMEM);
  
- 	lock = cl_lock_at_pgoff(env, osc2cl(obj), index, NULL, 1, 0);
- 	LASSERT(lock->cll_descr.cld_mode >= CLM_WRITE);
+ 	olck = osc_env_io(env)->oi_write_osclock;
+ 	LASSERTF(olck, "page %lu is not covered by lock\n", index);
+ 	LASSERT(olck->ols_state == OLS_GRANTED);
+ 
+ 	descr = &olck->ols_cl.cls_lock->cll_descr;
+ 	LASSERT(descr->cld_mode >= CLM_WRITE);
  
 -	LASSERT(cli->cl_chunkbits >= PAGE_CACHE_SHIFT);
 -	ppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT;
 +	LASSERT(cli->cl_chunkbits >= PAGE_SHIFT);
 +	ppc_bits = cli->cl_chunkbits - PAGE_SHIFT;
  	chunk_mask = ~((1 << ppc_bits) - 1);
  	chunksize = 1 << cli->cl_chunkbits;
  	chunk = index >> ppc_bits;
@@@ -1288,14 -1309,14 +1309,14 @@@ static int osc_refresh_count(const stru
  	if (result < 0)
  		return result;
  	kms = attr->cat_kms;
- 	if (cl_offset(obj, page->cp_index) >= kms)
+ 	if (cl_offset(obj, index) >= kms)
  		/* catch race with truncate */
  		return 0;
- 	else if (cl_offset(obj, page->cp_index + 1) > kms)
+ 	else if (cl_offset(obj, index + 1) > kms)
  		/* catch sub-page write at end of file */
 -		return kms % PAGE_CACHE_SIZE;
 +		return kms % PAGE_SIZE;
  	else
 -		return PAGE_CACHE_SIZE;
 +		return PAGE_SIZE;
  }
  
  static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
@@@ -1373,13 -1394,13 +1394,13 @@@
  static void osc_consume_write_grant(struct client_obd *cli,
  				    struct brw_page *pga)
  {
- 	assert_spin_locked(&cli->cl_loi_list_lock.lock);
+ 	assert_spin_locked(&cli->cl_loi_list_lock);
  	LASSERT(!(pga->flag & OBD_BRW_FROM_GRANT));
  	atomic_inc(&obd_dirty_pages);
 -	cli->cl_dirty += PAGE_CACHE_SIZE;
 +	cli->cl_dirty += PAGE_SIZE;
  	pga->flag |= OBD_BRW_FROM_GRANT;
  	CDEBUG(D_CACHE, "using %lu grant credits for brw %p page %p\n",
 -	       PAGE_CACHE_SIZE, pga, pga->pg);
 +	       PAGE_SIZE, pga, pga->pg);
  	osc_update_next_shrink(cli);
  }
  
@@@ -1467,9 -1488,9 +1488,9 @@@ static void osc_free_grant(struct clien
  {
  	int grant = (1 << cli->cl_chunkbits) + cli->cl_extent_tax;
  
- 	client_obd_list_lock(&cli->cl_loi_list_lock);
+ 	spin_lock(&cli->cl_loi_list_lock);
  	atomic_sub(nr_pages, &obd_dirty_pages);
 -	cli->cl_dirty -= nr_pages << PAGE_CACHE_SHIFT;
 +	cli->cl_dirty -= nr_pages << PAGE_SHIFT;
  	cli->cl_lost_grant += lost_grant;
  	if (cli->cl_avail_grant < grant && cli->cl_lost_grant >= grant) {
  		/* borrow some grant from truncate to avoid the case that
diff --cc drivers/staging/lustre/lustre/osc/osc_page.c
index ce9ddd515f64,82979f4039c1..000000000000
--- a/drivers/staging/lustre/lustre/osc/osc_page.c
+++ b/drivers/staging/lustre/lustre/osc/osc_page.c
@@@ -410,10 -309,10 +309,10 @@@ int osc_page_init(const struct lu_env *
  	int result;
  
  	opg->ops_from = 0;
 -	opg->ops_to = PAGE_CACHE_SIZE;
 +	opg->ops_to = PAGE_SIZE;
  
- 	result = osc_prep_async_page(osc, opg, vmpage,
- 				     cl_offset(obj, page->cp_index));
+ 	result = osc_prep_async_page(osc, opg, page->cp_vmpage,
+ 				     cl_offset(obj, index));
  	if (result == 0) {
  		struct osc_io *oio = osc_env_io(env);
  
@@@ -486,10 -395,9 +395,9 @@@ static DECLARE_WAIT_QUEUE_HEAD(osc_lru_
  /* LRU pages are freed in batch mode. OSC should at least free this
   * number of pages to avoid running out of LRU budget, and..
   */
 -static const int lru_shrink_min = 2 << (20 - PAGE_CACHE_SHIFT);  /* 2M */
 +static const int lru_shrink_min = 2 << (20 - PAGE_SHIFT);  /* 2M */
  /* free this number at most otherwise it will take too long time to finish. */
- static const int lru_shrink_max = 32 << (20 - PAGE_SHIFT); /* 32M */
 -static const int lru_shrink_max = 8 << (20 - PAGE_CACHE_SHIFT); /* 8M */
++static const int lru_shrink_max = 8 << (20 - PAGE_SHIFT); /* 8M */
  
  /* Check if we can free LRU slots from this OSC. If there exists LRU waiters,
   * we should free slots aggressively. In this way, slots are freed in a steady
diff --cc drivers/staging/lustre/lustre/osc/osc_request.c
index 30526ebcad04,547539c74a7b..000000000000
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@@ -909,12 -910,12 +910,12 @@@ static void osc_shrink_grant_local(stru
  static int osc_shrink_grant(struct client_obd *cli)
  {
  	__u64 target_bytes = (cli->cl_max_rpcs_in_flight + 1) *
 -			     (cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT);
 +			     (cli->cl_max_pages_per_rpc << PAGE_SHIFT);
  
- 	client_obd_list_lock(&cli->cl_loi_list_lock);
+ 	spin_lock(&cli->cl_loi_list_lock);
  	if (cli->cl_avail_grant <= target_bytes)
 -		target_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;
 +		target_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT;
- 	client_obd_list_unlock(&cli->cl_loi_list_lock);
+ 	spin_unlock(&cli->cl_loi_list_lock);
  
  	return osc_shrink_grant_to_target(cli, target_bytes);
  }
@@@ -929,14 -930,14 +930,14 @@@ int osc_shrink_grant_to_target(struct c
  	 * We don't want to shrink below a single RPC, as that will negatively
  	 * impact block allocation and long-term performance.
  	 */
 -	if (target_bytes < cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT)
 -		target_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;
 +	if (target_bytes < cli->cl_max_pages_per_rpc << PAGE_SHIFT)
 +		target_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT;
  
  	if (target_bytes >= cli->cl_avail_grant) {
- 		client_obd_list_unlock(&cli->cl_loi_list_lock);
+ 		spin_unlock(&cli->cl_loi_list_lock);
  		return 0;
  	}
- 	client_obd_list_unlock(&cli->cl_loi_list_lock);
+ 	spin_unlock(&cli->cl_loi_list_lock);
  
  	body = kzalloc(sizeof(*body), GFP_NOFS);
  	if (!body)
@@@ -1052,8 -1053,8 +1053,8 @@@ static void osc_init_grant(struct clien
  	}
  
  	/* determine the appropriate chunk size used by osc_extent. */
 -	cli->cl_chunkbits = max_t(int, PAGE_CACHE_SHIFT, ocd->ocd_blocksize);
 +	cli->cl_chunkbits = max_t(int, PAGE_SHIFT, ocd->ocd_blocksize);
- 	client_obd_list_unlock(&cli->cl_loi_list_lock);
+ 	spin_unlock(&cli->cl_loi_list_lock);
  
  	CDEBUG(D_CACHE, "%s, setting cl_avail_grant: %ld cl_lost_grant: %ld chunk bits: %d\n",
  	       cli->cl_import->imp_obd->obd_name,
@@@ -1992,8 -2006,8 +2006,8 @@@ int osc_build_rpc(const struct lu_env *
  	if (tmp)
  		tmp->oap_request = ptlrpc_request_addref(req);
  
- 	client_obd_list_lock(&cli->cl_loi_list_lock);
+ 	spin_lock(&cli->cl_loi_list_lock);
 -	starting_offset >>= PAGE_CACHE_SHIFT;
 +	starting_offset >>= PAGE_SHIFT;
  	if (cmd == OBD_BRW_READ) {
  		cli->cl_r_in_flight++;
  		lprocfs_oh_tally_log2(&cli->cl_read_page_hist, page_count);
@@@ -2787,15 -2779,15 +2779,15 @@@ out
  			goto skip_locking;
  
  		policy.l_extent.start = fm_key->fiemap.fm_start &
- 						CFS_PAGE_MASK;
+ 						PAGE_MASK;
  
  		if (OBD_OBJECT_EOF - fm_key->fiemap.fm_length <=
 -		    fm_key->fiemap.fm_start + PAGE_CACHE_SIZE - 1)
 +		    fm_key->fiemap.fm_start + PAGE_SIZE - 1)
  			policy.l_extent.end = OBD_OBJECT_EOF;
  		else
  			policy.l_extent.end = (fm_key->fiemap.fm_start +
  				fm_key->fiemap.fm_length +
- 				PAGE_SIZE - 1) & CFS_PAGE_MASK;
 -				PAGE_CACHE_SIZE - 1) & PAGE_MASK;
++				PAGE_SIZE - 1) & PAGE_MASK;
  
  		ostid_build_res_name(&fm_key->oa.o_oi, &res_id);
  		mode = ldlm_lock_match(exp->exp_obd->obd_namespace,

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

[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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 481 bytes --]

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 Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]

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 Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/zram/zram_drv.c
index f2a73bd,6762b99..0000000
--- 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;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Fri, Apr 27, 2012 at 02:37:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/vt6656/ioctl.c between commit 17b7e1ba1e2e ("staging:
> vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl
> ()") from Linus' tree and commit 62ef30b5781d ("staging: vt6656: Remove
> redundant casts from ioctl.c") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

This should now be resolved, thanks.

greg k-h

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

[Greg KH]

On Fri, Apr 27, 2012 at 02:37:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/vt6656/ioctl.c between commit 17b7e1ba1e2e ("staging:
> vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl
> ()") from Linus' tree and commit 62ef30b5781d ("staging: vt6656: Remove
> redundant casts from ioctl.c") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, that looks correct.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/vt6656/ioctl.c between commit 17b7e1ba1e2e ("staging:
vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl
()") from Linus' tree and commit 62ef30b5781d ("staging: vt6656: Remove
redundant casts from ioctl.c") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/vt6656/ioctl.c
index d59456c,cc7357d..0000000
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@@ -565,7 -565,7 +565,7 @@@ int private_ioctl(PSDevice pDevice, str
  			result = -ENOMEM;
  			break;
  		}
- 		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
 -		pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
++		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
  		if (pNodeList == NULL) {
  			result = -ENOMEM;
  			break;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Tue, Feb 14, 2012 at 05:33:40PM -0600, Ramirez Luna, Omar wrote:
> On Tue, Feb 14, 2012 at 4:37 PM, Greg KH <greg@kroah.com> wrote:
> > On Tue, Feb 14, 2012 at 03:31:39PM -0600, Ramirez Luna, Omar wrote:
> >> Hi,
> >>
> >> On Thu, Feb 9, 2012 at 11:30 PM, Greg KH <greg@kroah.com> wrote:
> >> > On Fri, Feb 10, 2012 at 03:48:06PM +1100, Stephen Rothwell wrote:
> >> >> Hi Greg,
> >> >>
> >> >> Today's linux-next merge of the staging tree got a conflict in
> >> >> drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
> >> >> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
> >> >> Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
> >> >> header") from the staging tree.
> >> >>
> >> >> I fixed it up (I think - see below) and can carry the fix as necessary.
> >> >
> >> > Thanks, I'll try to fix this up with a merge tomorrow to get this in
> >> > sync.
> >>
> >> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks")
> >> was accidentally reverted with the merge of staging-3.3-rc3 on
> >> staging-next branch, the same patch still applies since the previous
> >> patch touching this code moves it some lines above.
> >
> > Ok, so what should I do here?  What patch should I apply to the
> > staging-next tree?  Just reapply 5a63177a6967?
> 
> Yes, reapplying 5a63177a6967 worked for me.

Ok, thanks, now done.

greg k-h

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

[Ramirez Luna, Omar]

On Tue, Feb 14, 2012 at 4:37 PM, Greg KH <greg@kroah.com> wrote:
> On Tue, Feb 14, 2012 at 03:31:39PM -0600, Ramirez Luna, Omar wrote:
>> Hi,
>>
>> On Thu, Feb 9, 2012 at 11:30 PM, Greg KH <greg@kroah.com> wrote:
>> > On Fri, Feb 10, 2012 at 03:48:06PM +1100, Stephen Rothwell wrote:
>> >> Hi Greg,
>> >>
>> >> Today's linux-next merge of the staging tree got a conflict in
>> >> drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
>> >> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
>> >> Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
>> >> header") from the staging tree.
>> >>
>> >> I fixed it up (I think - see below) and can carry the fix as necessary.
>> >
>> > Thanks, I'll try to fix this up with a merge tomorrow to get this in
>> > sync.
>>
>> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks")
>> was accidentally reverted with the merge of staging-3.3-rc3 on
>> staging-next branch, the same patch still applies since the previous
>> patch touching this code moves it some lines above.
>
> Ok, so what should I do here?  What patch should I apply to the
> staging-next tree?  Just reapply 5a63177a6967?

Yes, reapplying 5a63177a6967 worked for me.

Regards,

Omar

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

[Greg KH]

On Tue, Feb 14, 2012 at 03:31:39PM -0600, Ramirez Luna, Omar wrote:
> Hi,
> 
> On Thu, Feb 9, 2012 at 11:30 PM, Greg KH <greg@kroah.com> wrote:
> > On Fri, Feb 10, 2012 at 03:48:06PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the staging tree got a conflict in
> >> drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
> >> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
> >> Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
> >> header") from the staging tree.
> >>
> >> I fixed it up (I think - see below) and can carry the fix as necessary.
> >
> > Thanks, I'll try to fix this up with a merge tomorrow to get this in
> > sync.
> 
> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks")
> was accidentally reverted with the merge of staging-3.3-rc3 on
> staging-next branch, the same patch still applies since the previous
> patch touching this code moves it some lines above.

Ok, so what should I do here?  What patch should I apply to the
staging-next tree?  Just reapply 5a63177a6967?

confused,

greg k-h

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

[Ramirez Luna, Omar]

Hi,

On Thu, Feb 9, 2012 at 11:30 PM, Greg KH <greg@kroah.com> wrote:
> On Fri, Feb 10, 2012 at 03:48:06PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
>> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
>> Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
>> header") from the staging tree.
>>
>> I fixed it up (I think - see below) and can carry the fix as necessary.
>
> Thanks, I'll try to fix this up with a merge tomorrow to get this in
> sync.

5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks")
was accidentally reverted with the merge of staging-3.3-rc3 on
staging-next branch, the same patch still applies since the previous
patch touching this code moves it some lines above.

Regards,

Omar

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

[Greg KH]

On Fri, Feb 10, 2012 at 03:48:06PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
> Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
> header") from the staging tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.

Thanks, this should now be resolved in your next pull of my staging
trees.

greg k-h

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

[Greg KH]

On Fri, Feb 10, 2012 at 03:48:06PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
> Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
> header") from the staging tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.

Thanks, I'll try to fix this up with a merge tomorrow to get this in
sync.

greg k-h

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

[Greg KH]

On Fri, Feb 10, 2012 at 03:47:53PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/zcache/zcache-main.c between commit 2a4830110b90
> ("staging: zcache: fix serialization bug in zv stats") from Linus' tree
> (and also in the staging tree) and commit a49aeb1de585 ("staging: zcache:
> replace xvmalloc with zsmalloc") from the staging tree.
> 
> I used the staging tree version (since these were just further changes to
> the same bits of code).

Thanks, that sounds correct.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5874 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
header") from the staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/tidspbridge/rmgr/drv_interface.c
index 385740b,31b5140..0000000
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@@ -131,7 -117,157 +117,166 @@@ MODULE_AUTHOR("Texas Instruments")
  MODULE_LICENSE("GPL");
  MODULE_VERSION(DSPBRIDGE_VERSION);
  
- static char *driver_name = DRIVER_NAME;
+ /*
+  * This function is called when an application opens handle to the
+  * bridge driver.
+  */
+ static int bridge_open(struct inode *ip, struct file *filp)
+ {
+ 	int status = 0;
+ 	struct process_context *pr_ctxt = NULL;
+ 
+ 	/*
+ 	 * Allocate a new process context and insert it into global
+ 	 * process context list.
+ 	 */
+ 
+ #ifdef CONFIG_TIDSPBRIDGE_RECOVERY
+ 	if (recover) {
+ 		if (filp->f_flags & O_NONBLOCK ||
+ 		    wait_for_completion_interruptible(&bridge_open_comp))
+ 			return -EBUSY;
+ 	}
+ #endif
+ 	pr_ctxt = kzalloc(sizeof(struct process_context), GFP_KERNEL);
 -	if (pr_ctxt) {
 -		pr_ctxt->res_state = PROC_RES_ALLOCATED;
 -		spin_lock_init(&pr_ctxt->dmm_map_lock);
 -		INIT_LIST_HEAD(&pr_ctxt->dmm_map_list);
 -		spin_lock_init(&pr_ctxt->dmm_rsv_lock);
 -		INIT_LIST_HEAD(&pr_ctxt->dmm_rsv_list);
 -
 -		pr_ctxt->node_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
 -		if (pr_ctxt->node_id) {
 -			idr_init(pr_ctxt->node_id);
 -		} else {
 -			status = -ENOMEM;
 -			goto err;
 -		}
++	if (!pr_ctxt)
++		return -ENOMEM;
++
++	pr_ctxt->res_state = PROC_RES_ALLOCATED;
++	spin_lock_init(&pr_ctxt->dmm_map_lock);
++	INIT_LIST_HEAD(&pr_ctxt->dmm_map_list);
++	spin_lock_init(&pr_ctxt->dmm_rsv_lock);
++	INIT_LIST_HEAD(&pr_ctxt->dmm_rsv_list);
+ 
 -		pr_ctxt->stream_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
 -		if (pr_ctxt->stream_id)
 -			idr_init(pr_ctxt->stream_id);
 -		else
 -			status = -ENOMEM;
 -	} else {
++	pr_ctxt->node_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
++	if (!pr_ctxt->node_id) {
+ 		status = -ENOMEM;
++		goto err1;
+ 	}
 -err:
++
++	idr_init(pr_ctxt->node_id);
++
++	pr_ctxt->stream_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
++	if (!pr_ctxt->stream_id) {
++		status = -ENOMEM;
++		goto err2;
++	}
++
++	idr_init(pr_ctxt->stream_id);
++
+ 	filp->private_data = pr_ctxt;
++
+ #ifdef CONFIG_TIDSPBRIDGE_RECOVERY
 -	if (!status)
 -		atomic_inc(&bridge_cref);
++	atomic_inc(&bridge_cref);
+ #endif
++	return 0;
++
++err2:
++	kfree(pr_ctxt->node_id);
++err1:
++	kfree(pr_ctxt);
+ 	return status;
+ }
+ 
+ /*
+  * This function is called when an application closes handle to the bridge
+  * driver.
+  */
+ static int bridge_release(struct inode *ip, struct file *filp)
+ {
+ 	int status = 0;
+ 	struct process_context *pr_ctxt;
+ 
+ 	if (!filp->private_data) {
+ 		status = -EIO;
+ 		goto err;
+ 	}
+ 
+ 	pr_ctxt = filp->private_data;
+ 	flush_signals(current);
+ 	drv_remove_all_resources(pr_ctxt);
+ 	proc_detach(pr_ctxt);
++	kfree(pr_ctxt->node_id);
++	kfree(pr_ctxt->stream_id);
+ 	kfree(pr_ctxt);
+ 
+ 	filp->private_data = NULL;
+ 
+ err:
+ #ifdef CONFIG_TIDSPBRIDGE_RECOVERY
+ 	if (!atomic_dec_return(&bridge_cref))
+ 		complete(&bridge_comp);
+ #endif
+ 	return status;
+ }
+ 
+ /* This function provides IO interface to the bridge driver. */
+ static long bridge_ioctl(struct file *filp, unsigned int code,
+ 			 unsigned long args)
+ {
+ 	int status;
+ 	u32 retval = 0;
+ 	union trapped_args buf_in;
+ 
+ #ifdef CONFIG_TIDSPBRIDGE_RECOVERY
+ 	if (recover) {
+ 		status = -EIO;
+ 		goto err;
+ 	}
+ #endif
+ #ifdef CONFIG_PM
+ 	status = omap34_xxbridge_suspend_lockout(&bridge_suspend_data, filp);
+ 	if (status != 0)
+ 		return status;
+ #endif
+ 
+ 	if (!filp->private_data) {
+ 		status = -EIO;
+ 		goto err;
+ 	}
+ 
+ 	status = copy_from_user(&buf_in, (union trapped_args *)args,
+ 				sizeof(union trapped_args));
+ 
+ 	if (!status) {
+ 		status = api_call_dev_ioctl(code, &buf_in, &retval,
+ 					    filp->private_data);
+ 
+ 		if (!status) {
+ 			status = retval;
+ 		} else {
+ 			dev_dbg(bridge, "%s: IOCTL Failed, code: 0x%x "
+ 				"status 0x%x\n", __func__, code, status);
+ 			status = -1;
+ 		}
+ 
+ 	}
+ 
+ err:
+ 	return status;
+ }
+ 
+ /* This function maps kernel space memory to user space memory. */
+ static int bridge_mmap(struct file *filp, struct vm_area_struct *vma)
+ {
+ 	u32 status;
+ 
+ 	vma->vm_flags |= VM_RESERVED | VM_IO;
+ 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+ 
+ 	dev_dbg(bridge, "%s: vm filp %p start %lx end %lx page_prot %ulx "
+ 		"flags %lx\n", __func__, filp,
+ 		vma->vm_start, vma->vm_end, vma->vm_page_prot,
+ 		vma->vm_flags);
+ 
+ 	status = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+ 				 vma->vm_end - vma->vm_start,
+ 				 vma->vm_page_prot);
+ 	if (status != 0)
+ 		status = -EAGAIN;
+ 
+ 	return status;
+ }
  
  static const struct file_operations bridge_fops = {
  	.open = bridge_open,
@@@ -405,14 -540,10 +549,13 @@@ static int __devexit omap34_xx_bridge_r
  
  	if (driver_context) {
  		/* Put the DSP in reset state */
- 		ret = dsp_deinit(driver_context);
+ 		dsp_deinit(driver_context);
  		driver_context = 0;
- 		DBC_ASSERT(ret == true);
  	}
  
 +	kfree(drv_datap);
 +	dev_set_drvdata(bridge, NULL);
 +
  func_cont:
  	mem_ext_phys_pool_release();
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/zcache/zcache-main.c between commit 2a4830110b90
("staging: zcache: fix serialization bug in zv stats") from Linus' tree
(and also in the staging tree) and commit a49aeb1de585 ("staging: zcache:
replace xvmalloc with zsmalloc") from the staging tree.

I used the staging tree version (since these were just further changes to
the same bits of code).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Mon, Nov 28, 2011 at 03:18:57PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/iio/industrialio-core.c between commit aaa0b4f00729
> ("iio: iio_event_getfd -- fix ev_int build failure") from Linus' tree and
> commit f791cec85073 ("Subject: fix build breakage in
> drivers/staging/iio/industrialio-core.c") from the staging tree.
> 
> The former was a more extensive fix (and is upstream), so I used that.

Yes, that's fine, I'll handle the merge when 3.2-rc4 is out, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/iio/industrialio-core.c between commit aaa0b4f00729
("iio: iio_event_getfd -- fix ev_int build failure") from Linus' tree and
commit f791cec85073 ("Subject: fix build breakage in
drivers/staging/iio/industrialio-core.c") from the staging tree.

The former was a more extensive fix (and is upstream), so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Tue, Sep 20, 2011 at 04:46:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/ni_labpc.c between commit c19cc78efe92
> ("staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is
> not enabled") from Linus' tree and commit d6aa8366dde1 ("staging: fix
> comedi build errors") from the staging tree.
> 
> I have used the version from Linus' tree.

Thank you, that should be correct.  I'll merge the two together when
kernel.org comes back.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/ni_labpc.c between commit c19cc78efe92
("staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is
not enabled") from Linus' tree and commit d6aa8366dde1 ("staging: fix
comedi build errors") from the staging tree.

I have used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Greg KH]

On Fri, May 13, 2011 at 02:08:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/usbip/vhci_sysfs.c between commit d1b2e95ab016 ("staging:
> usbip: vhci: fix oops on subsequent attach") from Linus' tree and commit
> 7aaacb43ed97 ("staging: usbip: fix header includes") from the staging
> tree.
> 
> The latter superceded the former for the conflict in the includes.

Ah, missed that, thanks, I'll merge these together soon and resolve
them.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/usbip/vhci_sysfs.c between commit d1b2e95ab016 ("staging:
usbip: vhci: fix oops on subsequent attach") from Linus' tree and commit
7aaacb43ed97 ("staging: usbip: fix header includes") from the staging
tree.

The latter superceded the former for the conflict in the includes.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Greg KH]

On Thu, Apr 28, 2011 at 12:59:13PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rt2860/common/cmm_data_pci.c
> drivers/staging/rt2860/common/cmm_data_usb.c between commit e9c549998dc2
> ("Revert wrong fixes for common misspellings") from Linus' tree and
> commit fefecc6989b4 ("staging: rt2860sta and rt2870sta: Remove drivers
> replaced in net/wireless") from the staging tree.
> 
> The files modified by the former were removed by the latter, so I did
> that.

Thanks, that is correct.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c between commit e9c549998dc2
("Revert wrong fixes for common misspellings") from Linus' tree and
commit fefecc6989b4 ("staging: rt2860sta and rt2870sta: Remove drivers
replaced in net/wireless") from the staging tree.

The files modified by the former were removed by the latter, so I did
that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Greg KH]

On Fri, Apr 08, 2011 at 03:47:56PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/README between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit 4a266c4fc99d ("staging:
> brcm80211: moved several README items to website") from the staging tree.
> 
> The latter removed the text that the former fixed up, so I did that.

Ok, all of the staging-next tree merge issues with Linus's tree should
now be resolved.  Please let me know if there are any that I missed.

thanks,

greg k-h

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

[Greg KH]

On Fri, Apr 08, 2011 at 03:47:56PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/README between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit 4a266c4fc99d ("staging:
> brcm80211: moved several README items to website") from the staging tree.
> 
> The latter removed the text that the former fixed up, so I did that.

Thanks, it looks like the spelling changes hit a lot of staging stuff so
I will merge with Linus's tree and resolve them next week.

thanks,

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/gma500/psb_ttm_fence_user.h between commit 25985edcedea
("Fix common misspellings") from Linus' tree and commit aea74b656799
("staging: gma500: kill off TTM") from the staging tree.

The latter removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ath6kl/os/linux/ar6000_android.c between commit
25985edcedea ("Fix common misspellings") from Linus' tree and commit
8efba264d45d ("ath6kl: kill Android specific code") from the staging tree.

The latter removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/hv/hv_util.c between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit af7a5b6e598c ("staging: hv:
Replaced DPRINT and printk with native functions in hv_utils") from the
staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/hv/hv_util.c
index 2df1568,3af0a11..0000000
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@@ -79,8 -78,8 +78,8 @@@ static void shutdown_onchannelcallback(
  				icmsghdrp->status = HV_S_OK;
  				execute_shutdown = true;
  
- 				DPRINT_INFO(VMBUS, "Shutdown request received -"
- 					    " graceful shutdown initiated");
+ 				pr_info("Shutdown request received -"
 -					    " gracefull shutdown initiated\n");
++					    " graceful shutdown initiated\n");
  				break;
  			default:
  				icmsghdrp->status = HV_E_FAIL;

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/gma500/psb_drm.h between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit aea74b656799 ("staging:
gma500: kill off TTM") from the staging tree.

The latter removes the line that the former fixed, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c between commit
25985edcedea ("Fix common misspellings") from Linus' tree and commit
b3b97f5c23c0 ("staging/brcm80211: Fix common spelling mistakes") from the
staging tree.

The latter is a superset fo the former (for the conflicting line).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/README between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit 4a266c4fc99d ("staging:
brcm80211: moved several README items to website") from the staging tree.

The latter removed the text that the former fixed up, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

Hi Greg,

On Wed, 9 Dec 2009 12:30:18 -0800 Greg KH <greg@kroah.com> wrote:
>
> Thanks, I'll fix this up when I sync up with Linus later today.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

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

[Greg KH]

On Wed, Dec 09, 2009 at 04:34:35PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/vt6655/Kconfig and drivers/staging/vt6656/Kconfig between
> commit 125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper
> selection of WIRELESS_EXT and WEXT_PRIV") from Linus' tree and commit
> a0d2ec259009d9378343697af84636f1e16c2421 ("Staging: vt6x depends on
> WLAN") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix for a while.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/staging/vt6655/Kconfig
> index 825bbc4,ed51d7c..0000000
> --- a/drivers/staging/vt6655/Kconfig
> +++ b/drivers/staging/vt6655/Kconfig
> @@@ -1,8 -1,6 +1,8 @@@
>   config VT6655
>      tristate "VIA Technologies VT6655 support"
> -    depends on PCI
>  -   depends on WIRELESS_EXT && PCI && WLAN
> ++   depends on PCI && WLAN
>  +   select WIRELESS_EXT
>  +   select WEXT_PRIV
>      ---help---
>      This is a vendor-written driver for VIA VT6655.
>   
> diff --cc drivers/staging/vt6656/Kconfig
> index 87bcd26,fcde661..0000000
> --- a/drivers/staging/vt6656/Kconfig
> +++ b/drivers/staging/vt6656/Kconfig
> @@@ -1,8 -1,6 +1,8 @@@
>   config VT6656
>   	tristate "VIA Technologies VT6656 support"
> - 	depends on USB
>  -	depends on WIRELESS_EXT && USB && WLAN
> ++	depends on USB && WLAN
>  +	select WIRELESS_EXT
>  +	select WEXT_PRIV
>   	---help---
>   	This is a vendor-written driver for VIA VT6656.

Thanks, I'll fix this up when I sync up with Linus later today.

greg k-h

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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/vt6655/Kconfig and drivers/staging/vt6656/Kconfig between
commit 125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper
selection of WIRELESS_EXT and WEXT_PRIV") from Linus' tree and commit
a0d2ec259009d9378343697af84636f1e16c2421 ("Staging: vt6x depends on
WLAN") from the staging tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/vt6655/Kconfig
index 825bbc4,ed51d7c..0000000
--- a/drivers/staging/vt6655/Kconfig
+++ b/drivers/staging/vt6655/Kconfig
@@@ -1,8 -1,6 +1,8 @@@
  config VT6655
     tristate "VIA Technologies VT6655 support"
-    depends on PCI
 -   depends on WIRELESS_EXT && PCI && WLAN
++   depends on PCI && WLAN
 +   select WIRELESS_EXT
 +   select WEXT_PRIV
     ---help---
     This is a vendor-written driver for VIA VT6655.
  
diff --cc drivers/staging/vt6656/Kconfig
index 87bcd26,fcde661..0000000
--- a/drivers/staging/vt6656/Kconfig
+++ b/drivers/staging/vt6656/Kconfig
@@@ -1,8 -1,6 +1,8 @@@
  config VT6656
  	tristate "VIA Technologies VT6656 support"
- 	depends on USB
 -	depends on WIRELESS_EXT && USB && WLAN
++	depends on USB && WLAN
 +	select WIRELESS_EXT
 +	select WEXT_PRIV
  	---help---
  	This is a vendor-written driver for VIA VT6656.