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

Commit 63fe46da authored by David S. Miller's avatar David S. Miller
Browse files

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c
parents 99dd1a2b 066b2118

Documentation/DocBook/kgdb.tmpl

+5 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
    kgdb is a source level debugger for linux kernel. It is used along

    with gdb to debug a linux kernel.  The expectation is that gdb can

    be used to "break in" to the kernel to inspect memory, variables

    and look through a cal stack information similar to what an

    and look through call stack information similar to what an

    application developer would use gdb for.  It is possible to place

    breakpoints in kernel code and perform some limited execution

    stepping.
@@ -93,8 +93,10 @@ 
  <chapter id="CompilingAKernel">

    <title>Compiling a kernel</title>

    <para>

    To enable <symbol>CONFIG_KGDB</symbol>, look under the "Kernel debugging"

    and then select "KGDB: kernel debugging with remote gdb".

    To enable <symbol>CONFIG_KGDB</symbol> you should first turn on

    "Prompt for development and/or incomplete code/drivers"

    (CONFIG_EXPERIMENTAL) in  "General setup", then under the

    "Kernel debugging" select "KGDB: kernel debugging with remote gdb".

    </para>

    <para>

    Next you should choose one of more I/O drivers to interconnect debugging

Documentation/cgroups.txt

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

  mkdir Charlie

  cd Charlie

  /bin/echo 2-3 > cpus

  /bin/echo 1 > mems

  /bin/echo 2-3 > cpuset.cpus

  /bin/echo 1 > cpuset.mems

  /bin/echo $$ > tasks

  sh

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

Documentation/feature-removal-schedule.txt

+8 −0
Original line number 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

When:	January 2010

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

Documentation/filesystems/Locking

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

	void (*dirty_inode) (struct inode *);

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

	void (*put_inode) (struct inode *);

	void (*drop_inode) (struct inode *);

	void (*delete_inode) (struct inode *);

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

dirty_inode:		no				(must not sleep)

write_inode:		no

put_inode:		no

drop_inode:		no				!!!inode_lock!!!

delete_inode:		no

put_super:		yes	yes	no

Documentation/filesystems/vfs.txt

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


        void (*dirty_inode) (struct inode *);

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

        void (*put_inode) (struct inode *);

        void (*drop_inode) (struct inode *);

        void (*delete_inode) (struct inode *);

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

	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,

	with the inode_lock spinlock held.