Merge branch 'master' into next

Conflicts:
	fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
  		nd->flags |= LOOKUP_CONTINUE;
  		err = exec_permission_lite(inode);
  		if (err == -EAGAIN)
- 			err = vfs_permission(nd, MAY_EXEC);
+ 			err = inode_permission(nd->path.dentry->d_inode,
+ 					       MAY_EXEC);
 +		if (!err)
 +			err = ima_path_check(&nd->path, MAY_EXEC);
   		if (err)
  			break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
  		flag &= ~O_TRUNC;
  	}

- 	error = vfs_permission(nd, acc_mode);
+ 	error = inode_permission(inode, acc_mode);
  	if (error)
  		return error;
 +
- 	error = ima_path_check(&nd->path,
++	error = ima_path_check(path,
 +			       acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
 +	if (error)
 +		return error;
  	/*
  	 * An append-only file must be opened in append mode for writing.
  	 */

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 118 insertions, 57 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 12fc2805ab4..a781f2ec082 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -616,7 +616,7 @@ M:	mkpetch@internode.on.net
 S:      Maintained
 
 ARM/TOSA MACHINE SUPPORT
-P:      Dmitry Baryshkov
+P:      Dmitry Eremin-Solenikov
 M:      dbaryshkov@gmail.com
 P:      Dirk Opfer
 M:      dirk@opfer-online.de
@@ -911,7 +911,7 @@ S:	Maintained
 BLACKFIN ARCHITECTURE
 P:      Bryan Wu
 M:      cooloney@kernel.org
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 
@@ -1024,16 +1024,17 @@ S:	Maintained
 BTTV VIDEO4LINUX DRIVER
 P:      Mauro Carvalho Chehab
 M:      mchehab@infradead.org
-M:      v4l-dvb-maintainer@linuxtv.org
+L:      linux-media@vger.kernel.org
 L:      video4linux-list@redhat.com
 W:      http://linuxtv.org
-T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
 P:      Jonathan Corbet
 M:      corbet@lwn.net
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 CALGARY x86-64 IOMMU
@@ -1092,11 +1093,8 @@ S:	Maintained
 
 CHECKPATCH
 P:      Andy Whitcroft
-M:      apw@shadowen.org
-P:      Randy Dunlap
-M:      rdunlap@xenotime.net
-P:      Joel Schopp
-M:      jschopp@austin.ibm.com
+M:      apw@canonical.com
+L:      linux-kernel@vger.kernel.org
 S:      Supported
 
 CISCO 10G ETHERNET DRIVER
@@ -1264,7 +1262,8 @@ P:	Hans Verkuil, Andy Walls
 M:      hverkuil@xs4all.nl, awalls@radix.net
 L:      ivtv-devel@ivtvdriver.org
 L:      ivtv-users@ivtvdriver.org
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://linuxtv.org
 S:      Maintained
 
@@ -1361,6 +1360,11 @@ P:	Maciej W. Rozycki
 M:      macro@linux-mips.org
 S:      Maintained
 
+DELL LAPTOP DRIVER
+P:      Matthew Garrett
+M:      mjg59@srcf.ucam.org
+S:      Maintained
+
 DELL LAPTOP SMM DRIVER
 P:      Massimo Dal Zotto
 M:      dz@debian.org
@@ -1490,10 +1494,10 @@ S:	Maintained
 
 DVB SUBSYSTEM AND DRIVERS
 P:      LinuxTV.org Project
-M:      v4l-dvb-maintainer@linuxtv.org
+M:      linux-media@vger.kernel.org
 L:      linux-dvb@linuxtv.org (subscription required)
 W:      http://linuxtv.org/
-T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 DZ DECSTATION DZ11 SERIAL DRIVER
@@ -1577,6 +1581,13 @@ L:	bluesmoke-devel@lists.sourceforge.net
 W:      bluesmoke.sourceforge.net
 S:      Maintained
 
+EDAC-I5400
+P:      Mauro Carvalho Chehab
+M:      mchehab@redhat.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
 EDAC-I82975X
 P:      Ranganathan Desikan
 P:      Arvind R.
@@ -1810,6 +1821,14 @@ M:	hch@infradead.org
 W:      ftp://ftp.openlinux.org/pub/people/hch/vxfs
 S:      Maintained
 
+FREEZER
+P:      Pavel Machek
+M:      pavel@suse.cz
+P:      Rafael J. Wysocki
+M:      rjw@sisk.pl
+L:      linux-pm@lists.linux-foundation.org
+S:      Supported
+
 FTRACE
 P:      Steven Rostedt
 M:      rostedt@goodmis.org
@@ -1885,32 +1904,37 @@ S:	Maintained
 GSPCA FINEPIX SUBDRIVER
 P:      Frank Zago
 M:      frank@zago.net
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 GSPCA M5602 SUBDRIVER
 P:      Erik Andren
 M:      erik.andren@gmail.com
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 GSPCA PAC207 SONIXB SUBDRIVER
 P:      Hans de Goede
 M:      hdegoede@redhat.com
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 GSPCA T613 SUBDRIVER
 P:      Leandro Costantino
 M:      lcostantino@gmail.com
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 GSPCA USB WEBCAM DRIVER
 P:      Jean-Francois Moine
 M:      moinejf@free.fr
 W:      http://moinejf.free.fr
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 HARDWARE MONITORING
@@ -2049,6 +2073,12 @@ M:	mikulas@artax.karlin.mff.cuni.cz
 W:      http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
 S:      Maintained
 
+HSO     3G Modem Driver (hso.c)
+P:      Denis Joseph Barrow
+M:      d.barow@option.com
+W:      http://www.pharscape.org
+S:      Maintained
+
 HTCPEN TOUCHSCREEN DRIVER
 P:      Pau Oliva Fora
 M:      pof@eslack.org
@@ -2072,7 +2102,8 @@ M:	khali@linux-fr.org
 P:      Ben Dooks (embedded platforms)
 M:      ben-linux@fluff.org
 L:      linux-i2c@vger.kernel.org
-T:      quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
+W:      http://i2c.wiki.kernel.org/
+T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
 S:      Maintained
 
 I2C-TINY-USB DRIVER
@@ -2146,11 +2177,6 @@ M:	Gadi Oxman <gadio@netvision.net.il>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-IDE-SCSI DRIVER
-L:      linux-ide@vger.kernel.org
-L:      linux-scsi@vger.kernel.org
-S:      Orphan
-
 IDLE-I7300
 P:      Andy Henroid
 M:      andrew.d.henroid@intel.com
@@ -2191,7 +2217,7 @@ P:	Sean Hefty
 M:      sean.hefty@intel.com
 P:      Hal Rosenstock
 M:      hal.rosenstock@gmail.com
-L:      general@lists.openfabrics.org
+L:      general@lists.openfabrics.org (moderated for non-subscribers)
 W:      http://www.openib.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:      Supported
@@ -2312,6 +2338,14 @@ W:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2200.sourceforge.net
 S:      Supported
 
+INTEL WIRELESS WIMAX CONNECTION 2400
+P:      Inaky Perez-Gonzalez
+M:      inaky.perez-gonzalez@intel.com
+M:      linux-wimax@intel.com
+L:      wimax@linuxwimax.org
+S:      Supported
+W:      http://linuxwimax.org
+
 INTEL WIRELESS WIFI LINK (iwlwifi)
 P:      Zhu Yi
 M:      yi.zhu@intel.com
@@ -2436,7 +2470,8 @@ P:	Hans Verkuil
 M:      hverkuil@xs4all.nl
 L:      ivtv-devel@ivtvdriver.org
 L:      ivtv-users@ivtvdriver.org
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://www.ivtvdriver.org
 S:      Maintained
 
@@ -2546,8 +2581,6 @@ W:	http://kvm.qumranet.com
 S:      Supported
 
 KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
-P:      Anthony Xu
-M:      anthony.xu@intel.com
 P:      Xiantao Zhang
 M:      xiantao.zhang@intel.com
 L:      kvm-ia64@vger.kernel.org
@@ -2640,13 +2673,13 @@ W:	http://www.hansenpartnership.com/voyager
 S:      Maintained
 
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
-P:      Paul Mackerras
-M:      paulus@samba.org
 P:      Benjamin Herrenschmidt
 M:      benh@kernel.crashing.org
+P:      Paul Mackerras
+M:      paulus@samba.org
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
-T:      git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/benh/powerpc.git
 S:      Supported
 
 LINUX FOR POWER MACINTOSH
@@ -2808,8 +2841,6 @@ S:	Maintained
 MAC80211
 P:      Johannes Berg
 M:      johannes@sipsolutions.net
-P:      Michael Wu
-M:      flamingice@sourmilk.net
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -2991,6 +3022,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 P:      Felipe Balbi
 M:      felipe.balbi@nokia.com
 L:      linux-usb@vger.kernel.org
+T:      git gitorious.org:/musb/mainline.git
 S:      Maintained
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
@@ -3197,7 +3229,8 @@ S:	Maintained
 OMNIVISION OV7670 SENSOR DRIVER
 P:      Jonathan Corbet
 M:      corbet@lwn.net
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 ONENAND FLASH DRIVER
@@ -3475,12 +3508,19 @@ L:	linuxppc-dev@ozlabs.org
 L:      cbe-oss-dev@ozlabs.org
 S:      Supported
 
+PS3VRAM DRIVER
+P:      Jim Paris
+M:      jim@jtan.com
+L:      cbe-oss-dev@ozlabs.org
+S:      Maintained
+
 PVRUSB2 VIDEO4LINUX DRIVER
 P:      Mike Isely
 M:      isely@pobox.com
 L:      pvrusb2@isely.net       (subscribers-only)
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
 W:      http://www.isely.net/pvrusb2/
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 PXA2xx/PXA3xx SUPPORT
@@ -3700,6 +3740,8 @@ S:	Supported
 SAA7146 VIDEO4LINUX-2 DRIVER
 P:      Michael Hunold
 M:      michael@mihu.de
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://www.mihu.de/linux/saa7146
 S:      Maintained
 
@@ -3964,7 +4006,8 @@ S:	Maintained
 SOC-CAMERA V4L2 SUBSYSTEM
 P:      Guennadi Liakhovetski
 M:      g.liakhovetski@gmx.de
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 SOEKRIS NET48XX LED SUPPORT
@@ -4022,10 +4065,12 @@ L:	alsa-devel@alsa-project.org (subscribers-only)
 W:      http://alsa-project.org/main/index.php/ASoC
 S:      Supported
 
-SPARC (sparc32)
-P:      William L. Irwin
-M:      wli@holomorphy.com
+SPARC + UltraSPARC (sparc/sparc64)
+P:      David S. Miller
+M:      davem@davemloft.net
 L:      sparclinux@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:      Maintained
 
 SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
@@ -4056,6 +4101,13 @@ L:	cbe-oss-dev@ozlabs.org
 W:      http://www.ibm.com/developerworks/power/cell/
 S:      Supported
 
+SQUASHFS FILE SYSTEM
+P:      Phillip Lougher
+M:      phillip@lougher.demon.co.uk
+L:      squashfs-devel@lists.sourceforge.net (subscribers-only)
+W:      http://squashfs.org.uk
+S:      Maintained
+
 SRM (Alpha) environment access
 P:      Jan-Benedict Glaw
 M:      jbglaw@lug-owl.de
@@ -4237,9 +4289,10 @@ L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:      Maintained
 
 TRIVIAL PATCHES
-P:      Jesper Juhl
+P:      Jiri Kosina
 M:      trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/jikos/trivial.git
 S:      Maintained
 
 TTY LAYER
@@ -4309,13 +4362,6 @@ M:	dushistov@mail.ru
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-UltraSPARC (sparc64)
-P:      David S. Miller
-M:      davem@davemloft.net
-L:      sparclinux@vger.kernel.org
-T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
-S:      Maintained
-
 ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 P:      David Vrabel
 M:      david.vrabel@csr.com
@@ -4387,7 +4433,8 @@ USB ET61X[12]51 DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
 L:      linux-usb@vger.kernel.org
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://www.linux-projects.org
 S:      Maintained
 
@@ -4536,7 +4583,8 @@ USB SN9C1xx DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
 L:      linux-usb@vger.kernel.org
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://www.linux-projects.org
 S:      Maintained
 
@@ -4565,7 +4613,8 @@ USB VIDEO CLASS
 P:      Laurent Pinchart
 M:      laurent.pinchart@skynet.be
 L:      linux-uvc-devel@lists.berlios.de (subscribers-only)
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://linux-uvc.berlios.de
 S:      Maintained
 
@@ -4573,7 +4622,8 @@ USB W996[87]CF DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
 L:      linux-usb@vger.kernel.org
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://www.linux-projects.org
 S:      Maintained
 
@@ -4587,7 +4637,8 @@ USB ZC0301 DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
 L:      linux-usb@vger.kernel.org
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://www.linux-projects.org
 S:      Maintained
 
@@ -4602,7 +4653,8 @@ USB ZR364XX DRIVER
 P:      Antoine Jacquet
 M:      royale@zerezo.com
 L:      linux-usb@vger.kernel.org
-L:      video4linux-list@redhat.com
+L:      linux-media@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:      http://royale.zerezo.com/zr364xx/
 S:      Maintained
 
@@ -4671,10 +4723,10 @@ S:	Maintained
 VIDEO FOR LINUX (V4L)
 P:      Mauro Carvalho Chehab
 M:      mchehab@infradead.org
-M:      v4l-dvb-maintainer@linuxtv.org
+L:      linux-media@vger.kernel.org
 L:      video4linux-list@redhat.com
 W:      http://linuxtv.org
-T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 
 VLAN (802.1Q)
@@ -4747,6 +4799,14 @@ M:	zaga@fly.cc.fer.hr
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 
+WIMAX STACK
+P:      Inaky Perez-Gonzalez
+M:      inaky.perez-gonzalez@intel.com
+M:      linux-wimax@intel.com
+L:      wimax@linuxwimax.org
+S:      Supported
+W:      http://linuxwimax.org
+
 WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
 P:      David Vrabel
 M:      david.vrabel@csr.com
@@ -4787,6 +4847,7 @@ P:	Ingo Molnar
 M:      mingo@redhat.com
 P:      H. Peter Anvin
 M:      hpa@zytor.com
+M:      x86@kernel.org
 L:      linux-kernel@vger.kernel.org
 T:      git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 S:      Maintained
@@ -4802,11 +4863,11 @@ S:	Supported
 
 XFS FILESYSTEM
 P:      Silicon Graphics Inc
-P:      Tim Shimmin
+P:      Bill O'Donnell
 M:      xfs-masters@oss.sgi.com
 L:      xfs@oss.sgi.com
 W:      http://oss.sgi.com/projects/xfs
-T:      git git://oss.sgi.com:8090/xfs/xfs-2.6.git
+T:      git://oss.sgi.com/xfs/xfs.git
 S:      Supported
 
 XILINX SYSTEMACE DRIVER