| Message ID | 20200324082903.19366-1-brgl@bgdev.pl |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] gpio: updates for v5.7 part 3 | expand |
Hi Bartosz, On Tue, Mar 24, 2020 at 9:29 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > this is the third and probably last batch of changes for v5.7 I picked up > into my tree. Details are in the signed tag. Please pull. Which rc is this based on? I got a bunch of unrelated changes, so I suppose I need to merge the right rc base to the devel branch first. Yours, Linus Walleij
wt., 24 mar 2020 o 10:05 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > Hi Bartosz, > > On Tue, Mar 24, 2020 at 9:29 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > this is the third and probably last batch of changes for v5.7 I picked up > > into my tree. Details are in the signed tag. Please pull. > > Which rc is this based on? I got a bunch of unrelated changes, so > I suppose I need to merge the right rc base to the devel branch > first. > > Yours, > Linus Walleij Hi Linus, this is rebased on top of your devel branch, so you should be able to pull it alright. Bart
On Tue, Mar 24, 2020 at 1:34 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > wt., 24 mar 2020 o 10:05 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > > > Hi Bartosz, > > > > On Tue, Mar 24, 2020 at 9:29 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > > this is the third and probably last batch of changes for v5.7 I picked up > > > into my tree. Details are in the signed tag. Please pull. > > > > Which rc is this based on? I got a bunch of unrelated changes, so > > I suppose I need to merge the right rc base to the devel branch > > first. > > > > Yours, > > Linus Walleij > > Hi Linus, > > this is rebased on top of your devel branch, so you should be able to > pull it alright. To me it looks like it is based on my for-next branch which is a mixdown branch that I create solely for inclusion into linux-next. Can you double-check? FWIW for-next is created like this: git checkout for-next git reset --hard fixes git merge devel So that branch is highly volatile and not very good for development. Yours, Linus Walleij
wt., 24 mar 2020 o 17:58 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > On Tue, Mar 24, 2020 at 1:34 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > wt., 24 mar 2020 o 10:05 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > > > > > Hi Bartosz, > > > > > > On Tue, Mar 24, 2020 at 9:29 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > > > > this is the third and probably last batch of changes for v5.7 I picked up > > > > into my tree. Details are in the signed tag. Please pull. > > > > > > Which rc is this based on? I got a bunch of unrelated changes, so > > > I suppose I need to merge the right rc base to the devel branch > > > first. > > > > > > Yours, > > > Linus Walleij > > > > Hi Linus, > > > > this is rebased on top of your devel branch, so you should be able to > > pull it alright. > > To me it looks like it is based on my for-next branch which is a > mixdown branch that I create solely for inclusion into > linux-next. > > Can you double-check? > > FWIW for-next is created like this: > git checkout for-next > git reset --hard fixes > git merge devel > > So that branch is highly volatile and not very good for > development. > > Yours, > Linus Walleij Hmm maybe I messed something up. What branch/tag do you want me to rebase it on then to make it the most comfortable for you? Bart
On Tue, Mar 24, 2020 at 6:59 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > wt., 24 mar 2020 o 17:58 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > > > On Tue, Mar 24, 2020 at 1:34 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > wt., 24 mar 2020 o 10:05 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > > > > > > > Hi Bartosz, > > > > > > > > On Tue, Mar 24, 2020 at 9:29 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > > > > > > this is the third and probably last batch of changes for v5.7 I picked up > > > > > into my tree. Details are in the signed tag. Please pull. > > > > > > > > Which rc is this based on? I got a bunch of unrelated changes, so > > > > I suppose I need to merge the right rc base to the devel branch > > > > first. > > > > > > > > Yours, > > > > Linus Walleij > > > > > > Hi Linus, > > > > > > this is rebased on top of your devel branch, so you should be able to > > > pull it alright. > > > > To me it looks like it is based on my for-next branch which is a > > mixdown branch that I create solely for inclusion into > > linux-next. > > > > Can you double-check? > > > > FWIW for-next is created like this: > > git checkout for-next > > git reset --hard fixes > > git merge devel > > > > So that branch is highly volatile and not very good for > > development. > > > > Yours, > > Linus Walleij > > Hmm maybe I messed something up. What branch/tag do you want me to > rebase it on then to make it the most comfortable for you? v5.6-rc1 or my devel branch (e.g if you have some deps) works fine, thanks! :) I tend to base all next development on -rc1 unless there is some big bug fix, then I pull in some later -rc as well. Linus
wt., 24 mar 2020 o 22:15 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > On Tue, Mar 24, 2020 at 6:59 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > wt., 24 mar 2020 o 17:58 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > > > > > On Tue, Mar 24, 2020 at 1:34 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > wt., 24 mar 2020 o 10:05 Linus Walleij <linus.walleij@linaro.org> napisał(a): > > > > > > > > > > Hi Bartosz, > > > > > > > > > > On Tue, Mar 24, 2020 at 9:29 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > > > > > > > > this is the third and probably last batch of changes for v5.7 I picked up > > > > > > into my tree. Details are in the signed tag. Please pull. > > > > > > > > > > Which rc is this based on? I got a bunch of unrelated changes, so > > > > > I suppose I need to merge the right rc base to the devel branch > > > > > first. > > > > > > > > > > Yours, > > > > > Linus Walleij > > > > > > > > Hi Linus, > > > > > > > > this is rebased on top of your devel branch, so you should be able to > > > > pull it alright. > > > > > > To me it looks like it is based on my for-next branch which is a > > > mixdown branch that I create solely for inclusion into > > > linux-next. > > > > > > Can you double-check? > > > > > > FWIW for-next is created like this: > > > git checkout for-next > > > git reset --hard fixes > > > git merge devel > > > > > > So that branch is highly volatile and not very good for > > > development. > > > > > > Yours, > > > Linus Walleij > > > > Hmm maybe I messed something up. What branch/tag do you want me to > > rebase it on then to make it the most comfortable for you? > > v5.6-rc1 or my devel branch (e.g if you have some deps) works fine, thanks! :) > > I tend to base all next development on -rc1 unless there is some big > bug fix, then I pull in some later -rc as well. > > Linus Ok, current devel branch from your tree it is. I'll send it as part4 in order not to delete existing signed tags. Bart
From: Bartosz Golaszewski <bgolaszewski@baylibre.com> Linus, this is the third and probably last batch of changes for v5.7 I picked up into my tree. Details are in the signed tag. Please pull. Bartosz The following changes since commit 9cd0c5e02ee4fcf8d0905def9b096b4222e179c2: Merge branch 'devel' into for-next (2020-03-03 15:02:01 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/gpio-updates-for-v5.7-part3 for you to fetch changes up to 8afb2c17f8309c99df1cb6a97918663978128e2c: tools: gpio: Fix typo in gpio-utils (2020-03-23 10:39:15 +0100) ---------------------------------------------------------------- gpio updates for v5.7 part 3 - improve comments in the uapi header - fix documentation issues - add a warning to gpio-pl061 when the IRQ line is not configured - allow building gpio-mxc and gpio-mxs with COMPILE_TEST enabled - don't print an error message when an optional IRQ is missing in gpio-mvebu - fix a potential segfault in gpio-hammer - fix a couple typos and coding style issues in gpio tools - provide a new flag in gpio-mmio and use it in mt7621 to fix an issue with the controller ignoring value setting when a GPIO is in input mode - slightly refactor gpio_name_to_desc() ---------------------------------------------------------------- Alexander Sverdlin (1): gpio: pl061: Warn when IRQ line has not been configured Anson Huang (2): gpio: mxc: Add COMPILE_TEST support for GPIO_MXC gpio: mxs: add COMPILE_TEST support for GPIO_MXS Chris Packham (1): gpio: mvebu: avoid error message for optional IRQ Chuanhong Guo (2): gpio: mmio: introduce BGPIOF_NO_SET_ON_INPUT gpio: mt7621: add BGPIOF_NO_SET_ON_INPUT flag Colin Ian King (1): tools: gpio-hammer: fix spelling mistake: "occurences" -> "occurrences" Gabriel Ravier (2): tools: gpio-hammer: Avoid potential overflow in main tools: gpio-hammer: Apply scripts/Lindent and retain good changes Jonathan Neuschäfer (1): gpio: uapi: Improve phrasing around arrays representing empty strings Mauro Carvalho Chehab (1): docs: gpio: driver.rst: don't mark literal blocks twice Michał Mirosław (1): gpiolib: gpio_name_to_desc: factor out !name check Mykyta Poturai (1): tools: gpio: Fix typo in gpio-utils Documentation/driver-api/gpio/driver.rst | 4 ++-- drivers/gpio/Kconfig | 4 ++-- drivers/gpio/gpio-mmio.c | 23 +++++++++++++++++++---- drivers/gpio/gpio-mt7621.c | 4 ++-- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-pl061.c | 6 ++---- drivers/gpio/gpiolib.c | 5 ++++- include/linux/gpio/driver.h | 1 + include/uapi/linux/gpio.h | 8 ++++---- tools/gpio/gpio-hammer.c | 19 +++++++++++++++++-- tools/gpio/gpio-utils.c | 6 +++--- 11 files changed, 57 insertions(+), 25 deletions(-)