Commit 6b6cbc14 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ce071832 1bf4b126

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ Linas Vepstas <linas@austin.ibm.com> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Mark Brown <broonie@sirena.org.uk>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
@@ -171,6 +173,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Documentation/filesystems/Locking

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ prototypes: 
	int (*permission) (struct inode *, int, unsigned int);

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

	int (*setattr) (struct dentry *, struct iattr *);

	int (*getattr) (const struct path *, struct dentry *, struct kstat *,

			u32, unsigned int);

	int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);

	ssize_t (*listxattr) (struct dentry *, char *, size_t);

	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);

	void (*update_time)(struct inode *, struct timespec *, int);

Documentation/filesystems/porting

+6 −0
Original line number Diff line number Diff line
@@ -600,3 +600,9 @@ in your dentry operations instead. 
[recommended]

	->readlink is optional for symlinks.  Don't set, unless filesystem needs

	to fake something for readlink(2).

--

[mandatory]

	->getattr() is now passed a struct path rather than a vfsmount and

	dentry separately, and it now has request_mask and query_flags arguments

	to specify the fields and sync type requested by statx.  Filesystems not

	supporting any statx-specific features may ignore the new arguments.

Documentation/filesystems/vfs.txt

+1 −2
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ struct inode_operations { 
	int (*permission) (struct inode *, int);

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

	int (*setattr) (struct dentry *, struct iattr *);

	int (*getattr) (const struct path *, struct dentry *, struct kstat *,

			u32, unsigned int);

	int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);

	ssize_t (*listxattr) (struct dentry *, char *, size_t);

	void (*update_time)(struct inode *, struct timespec *, int);

	int (*atomic_open)(struct inode *, struct dentry *, struct file *,

Documentation/pinctrl.txt

+7 −1
Original line number Diff line number Diff line
@@ -77,9 +77,15 @@ static struct pinctrl_desc foo_desc = { 


int __init foo_probe(void)

{

	int error;



	struct pinctrl_dev *pctl;



	return pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);

	error = pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);

	if (error)

		return error;



	return pinctrl_enable(pctl);

}



To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and

CRA Git | Maintained and supported by SUSTech CRA and CCSE