> + /* Create a new file under /proc/net/ipconfig */
> + static int ipconfig_proc_net_create(const char *name,
> + const struct file_operations *fops)
> + {
> + char *pname;
> + struct proc_dir_entry *p;
> +
> + if (!ipconfig_dir)
> + return
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/ipconfig.c
between commits:
3f3942aca6da ("proc: introduce proc_create_single{,_data}")
c04d2cb2009f ("ipconfig: Write NTP server IPs to
/proc/net/ipconfig/ntp_servers")
from the vfs tree and commit:
4d
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/tipc/socket.c
between commit:
ade994f4f6c8 ("net: annotate ->poll() instances")
from the vfs tree and commit:
60c253069632 ("tipc: fix race between poll() and setsockopt()")
from the net-next tree.
I fixed it
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/tipc/socket.c
between commit:
ade994f4f6c8 ("net: annotate ->poll() instances")
from the vfs tree and commit:
eb929a91b213 ("tipc: improve poll() for group member socket")
from the net-next tree.
I fixed it u
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/smc/smc_clc.c
between commit:
d63d271ce2b5 ("smc: switch to sock_recvmsg()")
from the vfs tree and commit:
e7b7a64a8493 ("smc: support variable CLC proposal messages")
from the net-next tree.
I fixed it up (s
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/ibm/ibmvnic.c
between commit:
98998345a579 ("ibmvnic: fix kstrtoul, copy_from_user and copy_to_user misuse")
from the vfs tree and commit:
e704f0434ea6 ("ibmvnic: Remove debugfs support")
from
