* linux-next: duplicate patch in the sysctl tree
@ 2023-10-11 5:20 ` Stephen Rothwell
2023-10-11 8:36 ` Joel Granados
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2023-10-11 5:20 UTC (permalink / raw)
To: Luis Chamberlain, Jens Axboe
Cc: Joel Granados, Phillip Potter, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
Hi all,
The following commit is also in the block tree as a different commit
(but the same patch):
80f3c6cfab37 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
This is commit
114b0ff62a65 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
in the block tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: duplicate patch in the sysctl tree
2023-10-11 5:20 ` linux-next: duplicate patch in the sysctl tree Stephen Rothwell
@ 2023-10-11 8:36 ` Joel Granados
2023-10-11 19:16 ` Luis Chamberlain
0 siblings, 1 reply; 6+ messages in thread
From: Joel Granados @ 2023-10-11 8:36 UTC (permalink / raw)
To: Stephen Rothwell, Luis Chamberlain
Cc: Jens Axboe, Phillip Potter, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 708 bytes --]
On Wed, Oct 11, 2023 at 04:20:50PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the block tree as a different commit
> (but the same patch):
>
> 80f3c6cfab37 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
>
> This is commit
>
> 114b0ff62a65 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
>
> in the block tree.
Is this a warning on the merge? or did it actually error out? if it is a
wraning and one of the two was skipped, it can be safely ignored as they
are the same. I can also remove that commit from my set and send another
version. @luis: How do you want to handle it?
--
Joel Granados
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: duplicate patch in the sysctl tree
2023-10-11 8:36 ` Joel Granados
@ 2023-10-11 19:16 ` Luis Chamberlain
2023-10-12 10:09 ` Joel Granados
0 siblings, 1 reply; 6+ messages in thread
From: Luis Chamberlain @ 2023-10-11 19:16 UTC (permalink / raw)
To: Joel Granados
Cc: Stephen Rothwell, Jens Axboe, Phillip Potter,
Linux Kernel Mailing List, Linux Next Mailing List
On Wed, Oct 11, 2023 at 10:36:12AM +0200, Joel Granados wrote:
> On Wed, Oct 11, 2023 at 04:20:50PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > The following commit is also in the block tree as a different commit
> > (but the same patch):
> >
> > 80f3c6cfab37 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
> >
> > This is commit
> >
> > 114b0ff62a65 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
> >
> > in the block tree.
> Is this a warning on the merge? or did it actually error out? if it is a
> wraning and one of the two was skipped, it can be safely ignored as they
> are the same. I can also remove that commit from my set and send another
> version. @luis: How do you want to handle it?
I just removed the cdrom patch from my tree.
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: duplicate patch in the sysctl tree
2023-10-11 19:16 ` Luis Chamberlain
@ 2023-10-12 10:09 ` Joel Granados
0 siblings, 0 replies; 6+ messages in thread
From: Joel Granados @ 2023-10-12 10:09 UTC (permalink / raw)
To: Luis Chamberlain
Cc: Stephen Rothwell, Jens Axboe, Phillip Potter,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 991 bytes --]
On Wed, Oct 11, 2023 at 12:16:49PM -0700, Luis Chamberlain wrote:
> On Wed, Oct 11, 2023 at 10:36:12AM +0200, Joel Granados wrote:
> > On Wed, Oct 11, 2023 at 04:20:50PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > The following commit is also in the block tree as a different commit
> > > (but the same patch):
> > >
> > > 80f3c6cfab37 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
> > >
> > > This is commit
> > >
> > > 114b0ff62a65 ("cdrom: Remove now superfluous sentinel element from ctl_table array")
> > >
> > > in the block tree.
> > Is this a warning on the merge? or did it actually error out? if it is a
> > wraning and one of the two was skipped, it can be safely ignored as they
> > are the same. I can also remove that commit from my set and send another
> > version. @luis: How do you want to handle it?
>
> I just removed the cdrom patch from my tree.
perfect thx.
>
> Luis
--
Joel Granados
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: duplicate patch in the sysctl tree
2023-07-14 4:48 Stephen Rothwell
@ 2023-07-14 18:48 ` Luis Chamberlain
0 siblings, 0 replies; 6+ messages in thread
From: Luis Chamberlain @ 2023-07-14 18:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Linux Kernel Mailing List, Linux Next Mailing List
On Fri, Jul 14, 2023 at 02:48:20PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different
> commit (but the same patch):
>
> 5664eaac4dcf ("sysctl: fix unused proc_cap_handler() function warning")
>
> This is commit
>
> 554588e8e932 ("sysctl: fix unused proc_cap_handler() function warning")
>
> in Linus' tree.
Thanks, fixed, although now my tree has nothing pending.
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: duplicate patch in the sysctl tree
@ 2023-07-14 4:48 Stephen Rothwell
2023-07-14 18:48 ` Luis Chamberlain
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2023-07-14 4:48 UTC (permalink / raw)
To: Luis Chamberlain
Cc: Arnd Bergmann, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
Hi all,
The following commit is also in Linus Torvalds' tree as a different
commit (but the same patch):
5664eaac4dcf ("sysctl: fix unused proc_cap_handler() function warning")
This is commit
554588e8e932 ("sysctl: fix unused proc_cap_handler() function warning")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-12 10:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20231011052057eucas1p2876288636c2eaaf61a36985cffb29f8e@eucas1p2.samsung.com>
2023-10-11 5:20 ` linux-next: duplicate patch in the sysctl tree Stephen Rothwell
2023-10-11 8:36 ` Joel Granados
2023-10-11 19:16 ` Luis Chamberlain
2023-10-12 10:09 ` Joel Granados
2023-07-14 4:48 Stephen Rothwell
2023-07-14 18:48 ` Luis Chamberlain
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).