Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3db0d4de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge fixes from Andrew Morton:
 "A few fixes.  One is a licensing change and I don't do licensing, so
  please eyeball that one"

Licensing eye-balled.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  lib/lz4: correct the LZ4 license
  memcg: get rid of swapaccount leftovers
  nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection
  nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error
  drivers/platform/olpc/olpc-ec.c: initialise earlier
parents 6a7492a4 ee8a99bd

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2953,7 +2953,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			improve throughput, but will also increase the

			amount of memory reserved for use by the client.



	swapaccount[=0|1]

	swapaccount=[0|1]

			[KNL] Enable accounting of swap in memory resource

			controller if no parameter or 1 is given or disable

			it if 0 is given (See Documentation/cgroups/memory.txt)

drivers/platform/olpc/olpc-ec.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int __init olpc_ec_init_module(void) 
	return platform_driver_register(&olpc_ec_plat_driver);

}



module_init(olpc_ec_init_module);

arch_initcall(olpc_ec_init_module);



MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");

MODULE_LICENSE("GPL");

fs/nilfs2/segbuf.c

+2 −3
Original line number Diff line number Diff line
@@ -345,8 +345,7 @@ static void nilfs_end_bio_write(struct bio *bio, int err) 


	if (err == -EOPNOTSUPP) {

		set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);

		bio_put(bio);

		/* to be detected by submit_seg_bio() */

		/* to be detected by nilfs_segbuf_submit_bio() */

	}



	if (!uptodate)
@@ -377,12 +376,12 @@ static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf, 
	bio->bi_private = segbuf;

	bio_get(bio);

	submit_bio(mode, bio);

	segbuf->sb_nbio++;

	if (bio_flagged(bio, BIO_EOPNOTSUPP)) {

		bio_put(bio);

		err = -EOPNOTSUPP;

		goto failed;

	}

	segbuf->sb_nbio++;

	bio_put(bio);



	wi->bio = NULL;

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ config MEMCG_SWAP_ENABLED 
	  Memory Resource Controller Swap Extension comes with its price in

	  a bigger memory consumption. General purpose distribution kernels

	  which want to enable the feature but keep it disabled by default

	  and let the user enable it by swapaccount boot command line

	  and let the user enable it by swapaccount=1 boot command line

	  parameter should have this option unselected.

	  For those who want to have the feature enabled by default should

	  select this option (if, for some reason, they need to disable it

lib/lz4/lz4_compress.c

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ int lz4_compress(const unsigned char *src, size_t src_len, 
exit:

	return ret;

}

EXPORT_SYMBOL_GPL(lz4_compress);

EXPORT_SYMBOL(lz4_compress);



MODULE_LICENSE("GPL");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_DESCRIPTION("LZ4 compressor");