From: Rob Herring <robh@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Guenter Roeck <linux@roeck-us.net>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: Re: linux-next: manual merge of the pci tree with Linus' tree
Date: Tue, 27 Mar 2018 11:19:38 -0500 [thread overview]
Message-ID: <CAL_JsqL5iRdk1tU78ZS9P+hw790XXUhwbSKiuz3N2Ag-DA0FAQ@mail.gmail.com> (raw)
In-Reply-To: <20180326122306.546ecb6d@canb.auug.org.au>
On Sun, Mar 25, 2018 at 8:23 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> include/linux/of_pci.h
>
> between commit:
>
> a6f1086e29e9 ("PCI: Move of_irq_parse_and_map_pci() declaration under OF_IRQ")
My series was based on top of this commit because of this conflict.
> from Linus' tree and commit:
>
> effab67ffe90 ("PCI: Move private DT related functions into private header")
>
> from the pci tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/of_pci.h
> index 091033a6b836,41155181ecbd..000000000000
> --- a/include/linux/of_pci.h
> +++ b/include/linux/of_pci.h
> @@@ -13,9 -13,7 +13,6 @@@ struct device_node
> struct device_node *of_pci_find_child_device(struct device_node *parent,
> unsigned int devfn);
> int of_pci_get_devfn(struct device_node *np);
> - int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
> - int of_get_pci_domain_nr(struct device_node *node);
> - int of_pci_get_max_link_speed(struct device_node *node);
> -int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
> void of_pci_check_probe_only(void);
> int of_pci_map_rid(struct device_node *np, u32 rid,
> const char *map_name, const char *map_mask_name,
> @@@ -32,18 -30,12 +29,6 @@@ static inline int of_pci_get_devfn(stru
> return -EINVAL;
> }
>
> - static inline int
> - of_pci_parse_bus_range(struct device_node *node, struct resource *res)
> - {
> - return -EINVAL;
> - }
> -
> --static inline int
> - of_get_pci_domain_nr(struct device_node *node)
> -of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
> --{
> - return -1;
> - return 0;
> --}
> --
> static inline int of_pci_map_rid(struct device_node *np, u32 rid,
> const char *map_name, const char *map_mask_name,
> struct device_node **target, u32 *id_out)
> @@@ -54,33 -46,4 +39,13 @@@
> static inline void of_pci_check_probe_only(void) { }
> #endif
>
> +#if IS_ENABLED(CONFIG_OF_IRQ)
> +int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
> +#else
> +static inline int
> +of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
> +{
> + return 0;
> +}
> +#endif
> -
> - #if defined(CONFIG_OF_ADDRESS)
> - int of_pci_get_host_bridge_resources(struct device_node *dev,
> - unsigned char busno, unsigned char bus_max,
> - struct list_head *resources, resource_size_t *io_base);
> - #else
> - static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
> - unsigned char busno, unsigned char bus_max,
> - struct list_head *resources, resource_size_t *io_base)
> - {
> - return -EINVAL;
> - }
> - #endif
> -
> #endif
next prev parent reply other threads:[~2018-03-27 16:20 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-26 1:23 linux-next: manual merge of the pci tree with Linus' tree Stephen Rothwell
2018-03-27 16:19 ` Rob Herring [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-13 23:45 Stephen Rothwell
2022-01-14 5:48 ` Sergio Paracuellos
2022-01-14 6:53 ` Stephen Rothwell
2022-01-14 6:57 ` Sergio Paracuellos
2021-08-25 0:57 Stephen Rothwell
2021-02-23 0:19 Stephen Rothwell
2020-05-14 1:02 Stephen Rothwell
2020-03-30 23:49 Stephen Rothwell
2020-03-31 8:37 ` Geert Uytterhoeven
2020-03-24 23:58 Stephen Rothwell
2019-09-19 12:33 Mark Brown
2018-07-20 1:03 Stephen Rothwell
2018-07-20 9:15 ` Lorenzo Pieralisi
2018-07-20 10:49 ` Thomas Petazzoni
2018-04-03 2:29 Stephen Rothwell
2017-06-26 0:51 Stephen Rothwell
2017-07-03 2:58 ` Stephen Rothwell
2016-12-08 23:44 Stephen Rothwell
2016-06-23 1:44 Stephen Rothwell
2016-06-23 16:43 ` Bjorn Helgaas
2016-01-20 23:33 Stephen Rothwell
2013-06-17 1:42 Stephen Rothwell
2013-06-04 1:49 Stephen Rothwell
2013-06-04 2:11 ` Bjorn Helgaas
2012-09-04 2:04 Stephen Rothwell
2012-09-04 1:59 Stephen Rothwell
2012-09-04 6:57 ` Yuval Mintz
2012-06-25 2:31 Stephen Rothwell
2012-06-25 6:32 ` huang ying
2012-06-25 14:14 ` Alan Stern
2012-06-19 1:15 Stephen Rothwell
2010-12-20 2:08 Stephen Rothwell
2009-12-07 0:25 Stephen Rothwell
2009-12-07 0:25 Stephen Rothwell
2009-10-14 0:05 Stephen Rothwell
2009-10-14 0:38 ` Jesse Barnes
2009-10-14 2:10 ` Stephen Rothwell
2009-10-14 7:41 ` David Woodhouse
2009-06-30 1:56 Stephen Rothwell
2009-06-30 2:01 ` Jesse Barnes
2009-06-30 2:16 ` Matthew Wilcox
2009-06-30 16:00 ` Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAL_JsqL5iRdk1tU78ZS9P+hw790XXUhwbSKiuz3N2Ag-DA0FAQ@mail.gmail.com \
--to=robh@kernel.org \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=lorenzo.pieralisi@arm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).