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

Commit 2d4b3f37 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 7022b15e 8033c6e9

.gitignore

+0 −1
Original line number Original line Diff line number Diff line
@@ -54,6 +54,5 @@ series 
cscope.*

cscope.*





*.orig

*.orig

*.rej

*~

*~

\#*#
 
\#*#

Documentation/cgroups.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -310,8 +310,8 @@ and then start a subshell 'sh' in that cgroup: 
  cd /dev/cgroup

  cd /dev/cgroup

  mkdir Charlie

  mkdir Charlie

  cd Charlie

  cd Charlie

  /bin/echo 2-3 > cpus

  /bin/echo 2-3 > cpuset.cpus

  /bin/echo 1 > mems

  /bin/echo 1 > cpuset.mems

  /bin/echo $$ > tasks

  /bin/echo $$ > tasks

  sh

  sh

  # The subshell 'sh' is now running in cgroup Charlie

  # The subshell 'sh' is now running in cgroup Charlie

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -289,6 +289,14 @@ Who: Glauber Costa <gcosta@redhat.com> 




---------------------------

---------------------------





What:	old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)

When:	2.6.28

Why:	This driver still uses the old interface and has been replaced

	by CONFIG_SERIAL_MCF.

Who:	Sebastian Siewior <sebastian@breakpoint.cc>



---------------------------



What:	/sys/o2cb symlink

What:	/sys/o2cb symlink

When:	January 2010

When:	January 2010

Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb

Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb

Documentation/filesystems/Locking

+0 −2
Original line number Original line Diff line number Diff line
@@ -92,7 +92,6 @@ prototypes: 
	void (*destroy_inode)(struct inode *);

	void (*destroy_inode)(struct inode *);

	void (*dirty_inode) (struct inode *);

	void (*dirty_inode) (struct inode *);

	int (*write_inode) (struct inode *, int);

	int (*write_inode) (struct inode *, int);

	void (*put_inode) (struct inode *);

	void (*drop_inode) (struct inode *);

	void (*drop_inode) (struct inode *);

	void (*delete_inode) (struct inode *);

	void (*delete_inode) (struct inode *);

	void (*put_super) (struct super_block *);

	void (*put_super) (struct super_block *);
@@ -115,7 +114,6 @@ alloc_inode: no no no 
destroy_inode:		no

destroy_inode:		no

dirty_inode:		no				(must not sleep)

dirty_inode:		no				(must not sleep)

write_inode:		no

write_inode:		no

put_inode:		no

drop_inode:		no				!!!inode_lock!!!

drop_inode:		no				!!!inode_lock!!!

delete_inode:		no

delete_inode:		no

put_super:		yes	yes	no

put_super:		yes	yes	no

Documentation/filesystems/vfs.txt

+0 −4
Original line number Original line Diff line number Diff line
@@ -205,7 +205,6 @@ struct super_operations { 




        void (*dirty_inode) (struct inode *);

        void (*dirty_inode) (struct inode *);

        int (*write_inode) (struct inode *, int);

        int (*write_inode) (struct inode *, int);

        void (*put_inode) (struct inode *);

        void (*drop_inode) (struct inode *);

        void (*drop_inode) (struct inode *);

        void (*delete_inode) (struct inode *);

        void (*delete_inode) (struct inode *);

        void (*put_super) (struct super_block *);

        void (*put_super) (struct super_block *);
@@ -246,9 +245,6 @@ or bottom half). 
	inode to disc.  The second parameter indicates whether the write

	inode to disc.  The second parameter indicates whether the write

	should be synchronous or not, not all filesystems check this flag.

	should be synchronous or not, not all filesystems check this flag.





  put_inode: called when the VFS inode is removed from the inode

	cache.



  drop_inode: called when the last access to the inode is dropped,

  drop_inode: called when the last access to the inode is dropped,

	with the inode_lock spinlock held.

	with the inode_lock spinlock held.