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

Commit 04a4e1fd authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'wireless-next/master' into HEAD

parents 19e737c9 e25aa82a
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -359,11 +359,9 @@ struct inode_operations {
	ssize_t (*listxattr) (struct dentry *, char *, size_t);
	int (*removexattr) (struct dentry *, const char *);
	void (*update_time)(struct inode *, struct timespec *, int);
	int (*atomic_open)(struct inode *, struct dentry *,
	int (*atomic_open)(struct inode *, struct dentry *, struct file *,
			unsigned open_flag, umode_t create_mode, int *opened);
	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
} ____cacheline_aligned;
				struct file *, unsigned open_flag,
				umode_t create_mode, int *opened);
};

Again, all methods are called without any locks being held, unless
@@ -470,9 +468,11 @@ otherwise noted.
  	method the filesystem can look up, possibly create and open the file in
  	one atomic operation.  If it cannot perform this (e.g. the file type
  	turned out to be wrong) it may signal this by returning 1 instead of
  	usual 0 or -ve .  This method is only called if the last
  	component is negative or needs lookup.  Cached positive dentries are
  	still handled by f_op->open().
	usual 0 or -ve .  This method is only called if the last component is
	negative or needs lookup.  Cached positive dentries are still handled by
	f_op->open().  If the file was created, the FILE_CREATED flag should be
	set in "opened".  In case of O_EXCL the method must only succeed if the
	file didn't exist and hence FILE_CREATED shall always be set on success.

  tmpfile: called in the end of O_TMPFILE open().  Optional, equivalent to
	atomically creating, opening and unlinking a file in given directory.
+6 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,12 @@ To add ARP targets:
To remove an ARP target:
# echo -192.168.0.100 > /sys/class/net/bond0/bonding/arp_ip_target

To configure the interval between learning packet transmits:
# echo 12 > /sys/class/net/bond0/bonding/lp_interval
	NOTE: the lp_inteval is the number of seconds between instances where
the bonding driver sends learning packets to each slaves peer switch.  The
default interval is 1 second.

Example Configuration
---------------------
	We begin with the same example that is shown in section 3.3,
+1 −3
Original line number Diff line number Diff line
@@ -66,9 +66,7 @@ rq->cfs.load value, which is the sum of the weights of the tasks queued on the
runqueue.

CFS maintains a time-ordered rbtree, where all runnable tasks are sorted by the
p->se.vruntime key (there is a subtraction using rq->cfs.min_vruntime to
account for possible wraparounds).  CFS picks the "leftmost" task from this
tree and sticks to it.
p->se.vruntime key. CFS picks the "leftmost" task from this tree and sticks to it.
As the system progresses forwards, the executed tasks are put into the tree
more and more to the right --- slowly but surely giving a chance for every task
to become the "leftmost task" and thus get on the CPU within a deterministic
+8 −0
Original line number Diff line number Diff line
@@ -6816,6 +6816,14 @@ L: linux-hexagon@vger.kernel.org
S:	Supported
F:	arch/hexagon/

QUALCOMM WCN36XX WIRELESS DRIVER
M:	Eugene Krasnikov <k.eugene.e@gmail.com>
L:	wcn36xx@lists.infradead.org
W:	http://wireless.kernel.org/en/users/Drivers/wcn36xx
T:	git git://github.com/KrasnikovEugene/wcn36xx.git
S:	Supported
F:	drivers/net/wireless/ath/wcn36xx/

QUICKCAM PARALLEL PORT WEBCAMS
M:	Hans Verkuil <hverkuil@xs4all.nl>
L:	linux-media@vger.kernel.org
+0 −3
Original line number Diff line number Diff line
@@ -288,9 +288,6 @@ endif
vmlinux.32: vmlinux
	$(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@


#obj-$(CONFIG_KPROBES)		+= kprobes.o

#
# The 64-bit ELF tools are pretty broken so at this time we generate 64-bit
# ELF files from 32-bit files by conversion.
Loading