Re: FAILED: patch "[PATCH] audit: convert PPIDs to the inital PID namespace." failed to apply to 3.14-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, May 04, 2014 at 09:45:52PM -0400, Richard Guy Briggs wrote:
> On 14/05/04, Ben Hutchings wrote:
> > On Sat, 2014-05-03 at 14:28 -0400, Greg KH wrote:
> > > On Sat, May 03, 2014 at 02:18:30PM -0400, Greg KH wrote:
> > > > On Fri, May 02, 2014 at 12:32:56PM -0400, Richard Guy Briggs wrote:
> > > > > On 14/05/01, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> > > > > > 
> > > > > > The patch below does not apply to the 3.14-stable tree.
> > > > > > If someone wants it applied there, or to any other stable or longterm
> > > > > > tree, then please email the backport, including the original git commit
> > > > > > id to <stable@xxxxxxxxxxxxxxx>.
> > > > > 
> > > > > Odd.  It applies to my checkout of 3.14.y at tag 3.14.2 with:
> > > > > 
> > > > > patching file kernel/audit.c
> > > > > Hunk #1 succeeded at 1829 (offset 10 lines).
> > > > > patching file kernel/auditsc.c
> > > > > Hunk #1 succeeded at 459 (offset -6 lines).
> > > > > 
> > > > > Are the offsets the problem?
> > > > 
> > > > I don't know what the problem was, but now it applies.  Very strange,
> > > > maybe it was depending on something that I hadn't applied yet?
> > > 
> > > Oh wait, now I remember, it breaks the build as-is, that's why I
> > > rejected it :)
> > > 
> > > here's the errors it causes:
> > > 
> > > kernel/audit.c:1835:5: error: implicit declaration of function ???task_ppid_nr??? [-Werror=implicit-function-declaration]
> > > 
> > > 3.14 doesn't have task_ppid_nr().  Is there some patch I should take
> > > before this patch is applied?
> > 
> > commit ad36d28293936b03d6b7996e9d6aadfd73c0eb08 ('pid: get pid_t ppid of
> > task in init_pid_ns')
> 
> What Ben said!  :D
> 
> (I've seen the two pulled in to a number of trees together as a pair.)

Thanks, that worked.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]