Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.10.87 arm64 23 add greybus #266

Open
wants to merge 42 commits into
base: 5.10-arm64
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
22898dd
merge: aufs-kbuild
RobertCNelson Dec 29, 2021
795c3fa
merge: aufs-base
RobertCNelson Dec 29, 2021
1493c5e
merge: aufs-mmap
RobertCNelson Dec 29, 2021
d15a746
merge: aufs-standalone
RobertCNelson Dec 29, 2021
1e190ae
merge: aufs
RobertCNelson Dec 29, 2021
8a1d1c9
merge: aufs-rt
RobertCNelson Dec 29, 2021
f3fc54f
merge: wpanusb: https://github.com/statropy/wpanusb
RobertCNelson Dec 29, 2021
c7e3c7b
Add WPANUSB driver
jadonk Jan 3, 2021
1505422
merge: bcfserial: https://github.com/statropy/bcfserial
RobertCNelson Dec 29, 2021
e4cd7cb
Add BCFSERIAL driver
RobertCNelson Nov 11, 2021
f0cc675
merge: ksmbd: https://github.com/cifsd-team/ksmbd
RobertCNelson Dec 29, 2021
43c6f4a
wire up ksmbd
RobertCNelson Oct 7, 2021
dd84743
Add wireless-regdb regulatory database file
RobertCNelson Dec 29, 2021
1dda0ec
dt-bindings: thermal: k3-j72xx: Add VTM bindings documentation
Keerthyj Oct 19, 2021
eedc79d
arm64: dts: ti: j721e: Add VTM node
Keerthyj Oct 19, 2021
35ead81
arm64: dts: ti: j7200: Add VTM node
Keerthyj Oct 19, 2021
109c76b
thermal: k3_j72xx_bandgap: Add the bandgap driver support
Keerthyj Oct 19, 2021
2d48e6c
Add BeagleBoard.org Device Tree Changes
RobertCNelson Dec 29, 2021
35cebf8
fix: pcie
RobertCNelson Aug 31, 2021
a4970d2
backports: pinmux: from: linux.git
RobertCNelson Dec 29, 2021
d80bb1f
NFM: spi: spidev: allow use of spidev in DT
RobertCNelson Oct 28, 2018
48e432c
Enable eQEP for TDA4VM/J721E
jadonk Nov 29, 2021
d962160
backports: bindeb-pkg: from: linux.git
RobertCNelson Dec 29, 2021
2456594
builddeb: Install our dtbs under /boot/dtbs/$version
RobertCNelson Mar 6, 2020
ea48b3b
builddeb: copy arm64/boot/Image to /boot/
RobertCNelson Jul 22, 2021
a9a6a12
5.10.87-ti-arm64-r23 patchset
RobertCNelson Dec 29, 2021
00a1173
5.10.87-ti-arm64-r23
RobertCNelson Dec 29, 2021
b81b30c
mikrobus driver update patch
vaishnavachath Oct 15, 2020
778becf
serdev: Add serdev_device_id
ribalda Oct 17, 2020
5a670b4
file2alias: Support for serdev devices
ribalda Oct 18, 2020
dd02387
mikrobus_add check for missing w1-gpio
vaishnavachath Dec 17, 2020
b16eb19
mikrobus: add re-enter id mode and fix multiple port
vaishnavachath Dec 24, 2020
7c0201c
serdev: add of_ helper to get serdev controller
vaishnavachath Oct 18, 2020
f3cf0ea
gnss: ubx add MODULE_DEVICE_TABLE(serdev)
vaishnavachath Oct 18, 2020
12e6a12
w1: change device name in w1_attach_slave
vaishnavachath Dec 30, 2020
06cc9c9
gnss: change of_property_read to device_property_read
vaishnavachath Oct 18, 2020
72f8e76
mikrobus: fix mikrobus id rescan
vaishnavachath Jan 11, 2021
6e905ec
greybus: add gb_netlink patch
vaishnavachath Jan 11, 2021
4148684
mikrobus: mikrobus over greybus
vaishnavachath Jan 12, 2021
f0960d0
mikrobus: add gbphy.h and mikrobus.h
vaishnavachath Jan 18, 2021
b30cc97
greybus: Kconfig syntax update
jadonk Jan 5, 2022
70b01d3
bb.org_defconfig: add GREYBUS and MIKROBUS
jadonk Jan 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge: aufs-base
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
RobertCNelson committed Dec 29, 2021

Verified

This commit was signed with the committer’s verified signature.
mr-manuel Manuel
commit 795c3fae31cf881bb3f7de0047c52421e168990e
13 changes: 13 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -3009,6 +3009,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*

AUFS (advanced multi layered unification filesystem) FILESYSTEM
M: "J. R. Okajima" <hooanon05g@gmail.com>
L: aufs-users@lists.sourceforge.net (members only)
L: linux-unionfs@vger.kernel.org
S: Supported
W: http://aufs.sourceforge.net
T: git://github.com/sfjro/aufs4-linux.git
F: Documentation/ABI/testing/debugfs-aufs
F: Documentation/ABI/testing/sysfs-aufs
F: Documentation/filesystems/aufs/
F: fs/aufs/
F: include/uapi/linux/aufs_type.h

AUXILIARY DISPLAY DRIVERS
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained
18 changes: 18 additions & 0 deletions drivers/block/loop.c
Original file line number Diff line number Diff line change
@@ -752,6 +752,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}

/*
* for AUFS
* no get/put for file.
*/
struct file *loop_backing_file(struct super_block *sb)
{
struct file *ret;
struct loop_device *l;

ret = NULL;
if (MAJOR(sb->s_dev) == LOOP_MAJOR) {
l = sb->s_bdev->bd_disk->private_data;
ret = l->lo_backing_file;
}
return ret;
}
EXPORT_SYMBOL_GPL(loop_backing_file);

/* loop sysfs attributes */

static ssize_t loop_attr_show(struct device *dev, char *page,
2 changes: 1 addition & 1 deletion fs/dcache.c
Original file line number Diff line number Diff line change
@@ -1285,7 +1285,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
static void d_walk(struct dentry *parent, void *data,
void d_walk(struct dentry *parent, void *data,
enum d_walk_ret (*enter)(void *, struct dentry *))
{
struct dentry *this_parent;
4 changes: 3 additions & 1 deletion fs/fcntl.c
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@

#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)

static int setfl(int fd, struct file * filp, unsigned long arg)
int setfl(int fd, struct file *filp, unsigned long arg)
{
struct inode * inode = file_inode(filp);
int error = 0;
@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)

if (filp->f_op->check_flags)
error = filp->f_op->check_flags(arg);
if (!error && filp->f_op->setfl)
error = filp->f_op->setfl(filp, arg);
if (error)
return error;

6 changes: 6 additions & 0 deletions fs/namespace.c
Original file line number Diff line number Diff line change
@@ -792,6 +792,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns;
}

/* for aufs, CONFIG_AUFS_BR_FUSE */
int is_current_mnt_ns(struct vfsmount *mnt)
{
return check_mnt(real_mount(mnt));
}

/*
* vfsmount lock must be held for write
*/
10 changes: 5 additions & 5 deletions fs/splice.c
Original file line number Diff line number Diff line change
@@ -756,8 +756,8 @@ static int warn_unsupported(struct file *file, const char *op)
/*
* Attempt to initiate a splice from pipe to file.
*/
static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
loff_t *ppos, size_t len, unsigned int flags)
long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
loff_t *ppos, size_t len, unsigned int flags)
{
if (unlikely(!out->f_op->splice_write))
return warn_unsupported(out, "write");
@@ -767,9 +767,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
/*
* Attempt to initiate a splice from a file to a pipe.
*/
static long do_splice_to(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags)
long do_splice_to(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags)
{
int ret;

2 changes: 1 addition & 1 deletion fs/sync.c
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
* wait == 1 case since in that case write_inode() functions do
* sync_dirty_buffer() and thus effectively write one block at a time.
*/
static int __sync_filesystem(struct super_block *sb, int wait)
int __sync_filesystem(struct super_block *sb, int wait)
{
if (wait)
sync_inodes_sb(sb);
4 changes: 4 additions & 0 deletions include/linux/fs.h
Original file line number Diff line number Diff line change
@@ -1332,6 +1332,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);

extern int setfl(int fd, struct file *filp, unsigned long arg);
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
@@ -1843,6 +1844,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
int (*setfl)(struct file *, unsigned long);
int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -2330,6 +2332,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode);
extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int);
extern int update_time(struct inode *, struct timespec64 *, int);

/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2566,6 +2569,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
}

void emergency_thaw_all(void);
extern int __sync_filesystem(struct super_block *, int);
extern int sync_filesystem(struct super_block *);
extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops;
3 changes: 3 additions & 0 deletions include/linux/lockdep.h
Original file line number Diff line number Diff line change
@@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}

struct lock_class *lockdep_hlock_class(struct held_lock *hlock);

/*
* Acquire a lock.
*
@@ -384,6 +386,7 @@ static inline void lockdep_unregister_key(struct lock_class_key *key)

#define lockdep_depth(tsk) (0)

#define lockdep_is_held(lock) (1)
#define lockdep_is_held_type(l, r) (1)

#define lockdep_assert_held(l) do { (void)(l); } while (0)
3 changes: 3 additions & 0 deletions include/linux/mnt_namespace.h
Original file line number Diff line number Diff line change
@@ -7,12 +7,15 @@ struct mnt_namespace;
struct fs_struct;
struct user_namespace;
struct ns_common;
struct vfsmount;

extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
struct user_namespace *, struct fs_struct *);
extern void put_mnt_ns(struct mnt_namespace *ns);
extern struct ns_common *from_mnt_ns(struct mnt_namespace *);

extern int is_current_mnt_ns(struct vfsmount *mnt);

extern const struct file_operations proc_mounts_operations;
extern const struct file_operations proc_mountinfo_operations;
extern const struct file_operations proc_mountstats_operations;
6 changes: 6 additions & 0 deletions include/linux/splice.h
Original file line number Diff line number Diff line change
@@ -93,4 +93,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);

extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
extern const struct pipe_buf_operations default_pipe_buf_ops;

extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
loff_t *ppos, size_t len, unsigned int flags);
extern long do_splice_to(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags);
#endif
3 changes: 2 additions & 1 deletion kernel/locking/lockdep.c
Original file line number Diff line number Diff line change
@@ -188,7 +188,7 @@ static
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);

static inline struct lock_class *hlock_class(struct held_lock *hlock)
inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
{
unsigned int class_idx = hlock->class_idx;

@@ -209,6 +209,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
#define hlock_class(hlock) lockdep_hlock_class(hlock)

#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);