> + /* 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
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/socket.c between commit 774157aa4897 ("net: switch importing msghdr
from userland to {compat_,}import_iovec()") from the vfs tree and
commit 0345f93138b2 ("net: socket: add support for async operations")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/compat.c between commit 774157aa4897 ("net: switch importing msghdr
from userland to {compat_,}import_iovec()") from the vfs tree and
commit 0345f93138b2 ("net: socket: add support for async operations")
from the net-next
On Fri, Mar 13, 2015 at 03:38:17PM +1100, Stephen Rothwell wrote:
> There is also a conflict with e9eab93cc2dc ("fs: don't allow to
> complete sync iocbs through aio_complete"), though it doesn't show up
> in the resolution since I I just used the next-next tree bits. So a
> common branch contain
From: Al Viro
Date: Fri, 13 Mar 2015 03:56:09 +
> On Thu, Mar 12, 2015 at 11:24:26PM -0400, David Miller wrote:
>> From: Stephen Rothwell
>> Date: Fri, 13 Mar 2015 13:15:43 +1100
>>
>> > Today's linux-next merge of the net-next tree got a conflict in
>> > net/socket.c between commits 005139
Hi Al,
On Fri, 13 Mar 2015 03:56:09 + Al Viro wrote:
>
> On Thu, Mar 12, 2015 at 11:24:26PM -0400, David Miller wrote:
> > From: Stephen Rothwell
> > Date: Fri, 13 Mar 2015 13:15:43 +1100
> >
> > > Today's linux-next merge of the net-next tree got a conflict in
> > > net/socket.c between co
On Thu, Mar 12, 2015 at 11:24:26PM -0400, David Miller wrote:
> From: Stephen Rothwell
> Date: Fri, 13 Mar 2015 13:15:43 +1100
>
> > Today's linux-next merge of the net-next tree got a conflict in
> > net/socket.c between commits 005139a14660 ("fs: remove ki_nbytes") and
> > e9eab93cc2dc ("fs: do
From: Stephen Rothwell
Date: Fri, 13 Mar 2015 13:15:43 +1100
> Today's linux-next merge of the net-next tree got a conflict in
> net/socket.c between commits 005139a14660 ("fs: remove ki_nbytes") and
> e9eab93cc2dc ("fs: don't allow to complete sync iocbs through
> aio_complete") from the vfs tre
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/socket.c between commits 005139a14660 ("fs: remove ki_nbytes") and
e9eab93cc2dc ("fs: don't allow to complete sync iocbs through
aio_complete") from the vfs tree and commit 1b784140474e ("net: Remove
iocb argument from sen
On Tue, Nov 25, 2014 at 09:23:52AM -0200, Marcelo Ricardo Leitner wrote:
> On 25-11-2014 00:42, Stephen Rothwell wrote:
> >Hi all,
> >
> >Today's linux-next merge of the net-next tree got a conflict in
> >net/netfilter/nf_log.c between commit e71456ae9871 ("netfilter: Remove
> >checks of seq_printf
On 25-11-2014 00:42, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/netfilter/nf_log.c between commit e71456ae9871 ("netfilter: Remove
checks of seq_printf() return values") from the vfs tree and commit
0c26ed1c07f1 ("netfilter: nf_log: Introd
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/netfilter/nf_log.c between commit e71456ae9871 ("netfilter: Remove
checks of seq_printf() return values") from the vfs tree and commit
0c26ed1c07f1 ("netfilter: nf_log: Introduce nft_log_dereference()
macro") from the net-
Hi,
How can I see source files applied your patch?
(I'm very new to kernel development.)
You patch looks like a patch for another patch.
Masatake YAMATO
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> net/socket.c between commits f8a78429cc70 ("take descriptor h
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/socket.c between commits f8a78429cc70 ("take descriptor handling from
sock_alloc_file() to callers") and 32b529f92ea7 ("unexport sock_map_fd(),
switch to sock_alloc_file()") from the vfs tree and commit 600e177920df
("net:
19 matches
Mail list logo
